diff options
| -rw-r--r-- | src/tests/test-mu-cmd.c | 35 | ||||
| -rw-r--r-- | src/tests/test-mu-msg.c | 40 | ||||
| -rw-r--r-- | src/tests/test-mu-query.c | 12 |
3 files changed, 53 insertions, 34 deletions
diff --git a/src/tests/test-mu-cmd.c b/src/tests/test-mu-cmd.c index f7973b5..62ac3fc 100644 --- a/src/tests/test-mu-cmd.c +++ b/src/tests/test-mu-cmd.c @@ -314,21 +314,26 @@ test_mu_extract_03 (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + int rv; + g_test_init (&argc, &argv, NULL); - g_test_add_func ("/mu-cmd/test-mu-index", test_mu_index); - g_test_add_func ("/mu-cmd/test-mu-find-01", test_mu_find_01); - g_test_add_func ("/mu-cmd/test-mu-find-02", test_mu_find_02); - g_test_add_func ("/mu-cmd/test-mu-find-03", test_mu_find_03); - g_test_add_func ("/mu-cmd/test-mu-find-04", test_mu_find_04); - g_test_add_func ("/mu-cmd/test-mu-extract-01", test_mu_extract_01); - g_test_add_func ("/mu-cmd/test-mu-extract-02", test_mu_extract_02); - g_test_add_func ("/mu-cmd/test-mu-extract-03", test_mu_extract_03); - - g_log_set_handler (NULL, - G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION, - (GLogFunc)black_hole, NULL); - - return g_test_run (); + g_test_add_func ("/mu-cmd/test-mu-index", test_mu_index); + g_test_add_func ("/mu-cmd/test-mu-find-01", test_mu_find_01); + g_test_add_func ("/mu-cmd/test-mu-find-02", test_mu_find_02); + g_test_add_func ("/mu-cmd/test-mu-find-03", test_mu_find_03); + g_test_add_func ("/mu-cmd/test-mu-find-04", test_mu_find_04); + g_test_add_func ("/mu-cmd/test-mu-extract-01", test_mu_extract_01); + g_test_add_func ("/mu-cmd/test-mu-extract-02", test_mu_extract_02); + g_test_add_func ("/mu-cmd/test-mu-extract-03", test_mu_extract_03); + + g_log_set_handler (NULL, + G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION, + (GLogFunc)black_hole, NULL); + + mu_msg_gmime_init (); + rv = g_test_run (); + mu_msg_gmime_uninit(); + + return rv; } diff --git a/src/tests/test-mu-msg.c b/src/tests/test-mu-msg.c index c023f1c..320e6d7 100644 --- a/src/tests/test-mu-msg.c +++ b/src/tests/test-mu-msg.c @@ -228,21 +228,27 @@ test_mu_msg_04 (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); - - /* mu_msg_str_date */ - g_test_add_func ("/mu-msg/mu-msg-01", - test_mu_msg_01); - g_test_add_func ("/mu-msg/mu-msg-02", - test_mu_msg_02); - g_test_add_func ("/mu-msg/mu-msg-03", - test_mu_msg_03); - g_test_add_func ("/mu-msg/mu-msg-04", - test_mu_msg_04); - - g_log_set_handler (NULL, - G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION, - (GLogFunc)black_hole, NULL); - - return g_test_run (); + int rv; + g_test_init (&argc, &argv, NULL); + + /* mu_msg_str_date */ + g_test_add_func ("/mu-msg/mu-msg-01", + test_mu_msg_01); + g_test_add_func ("/mu-msg/mu-msg-02", + test_mu_msg_02); + g_test_add_func ("/mu-msg/mu-msg-03", + test_mu_msg_03); + g_test_add_func ("/mu-msg/mu-msg-04", + test_mu_msg_04); + + g_log_set_handler (NULL, + G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION, + (GLogFunc)black_hole, NULL); + + mu_msg_gmime_init (); + rv = g_test_run (); + mu_msg_gmime_uninit (); + + return rv; + } diff --git a/src/tests/test-mu-query.c b/src/tests/test-mu-query.c index b330244..a72e301 100644 --- a/src/tests/test-mu-query.c +++ b/src/tests/test-mu-query.c @@ -107,12 +107,15 @@ test_mu_query_01 (void) { "funky", 1 }, { "fünkÿ", 1 }, }; + + xpath = fill_database (); g_assert (xpath != NULL); for (i = 0; i != G_N_ELEMENTS(queries); ++i) g_assert_cmpuint (run_and_count_matches (xpath, queries[i].query), ==, queries[i].count); + g_free (xpath); } @@ -233,8 +236,9 @@ test_mu_query_05 (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + int rv; + g_test_init (&argc, &argv, NULL); g_test_add_func ("/mu-query/test-mu-query-01", test_mu_query_01); g_test_add_func ("/mu-query/test-mu-query-02", test_mu_query_02); g_test_add_func ("/mu-query/test-mu-query-03", test_mu_query_03); @@ -244,7 +248,11 @@ main (int argc, char *argv[]) g_log_set_handler (NULL, G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION, (GLogFunc)black_hole, NULL); + + mu_msg_gmime_init (); + rv = g_test_run (); + mu_msg_gmime_uninit (); - return g_test_run (); + return rv; } |