From b41671462244c6cad9276cfe0158aa5c335cd53b Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Thu, 4 Feb 2010 22:48:13 +0200 Subject: [PATCH] * tests/: update test cases a bit --- src/tests/Makefile.am | 4 ++-- src/tests/test-mu-query.c | 35 +++++++++++++++++++++++++++++++---- src/tests/test-mu-util.c | 38 +++++++++++++++++++++++++++++++++++++- 3 files changed, 70 insertions(+), 7 deletions(-) diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 9989d6f0..8c3d4a33 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -20,8 +20,8 @@ INCLUDES=$(XAPIAN_CXXFLAGS) \ $(GMIME_CFLAGS) \ $(GLIB_CFLAGS) \ -I ${top_srcdir} \ - -DMU_TESTMAILDIR=\"${top_srcdir}/src/tests/testdir\" \ - -DMU_PROGRAM=\"${top_builddir}/src//mu\" \ + -DMU_TESTMAILDIR=\"${abs_srcdir}/src/tests/testdir\" \ + -DMU_PROGRAM=\"${abs_builddir}/src//mu\" \ -DABS_SRCDIR=\"${abs_srcdir}\" noinst_PROGRAMS= $(TEST_PROGS) diff --git a/src/tests/test-mu-query.c b/src/tests/test-mu-query.c index d1f8ba7b..1fd844b0 100644 --- a/src/tests/test-mu-query.c +++ b/src/tests/test-mu-query.c @@ -45,8 +45,6 @@ fill_database (void) cmdline = g_strdup_printf ("%s index --muhome=%s --maildir=%s" " --quiet", MU_PROGRAM, tmpdir, MU_TESTMAILDIR); - - g_print ("[%s]\n", cmdline); g_assert (g_spawn_command_line_sync (cmdline, NULL, NULL, NULL, NULL)); g_free (cmdline); @@ -85,7 +83,6 @@ test_mu_query_01 (void) query = mu_query_xapian_new (xpath); for (i = 0; i != G_N_ELEMENTS(queries); ++i) { - int count = 0; MuMsgIterXapian *iter = mu_query_xapian_run (query, queries[i].query, NULL, @@ -94,7 +91,6 @@ test_mu_query_01 (void) if (!mu_msg_iter_xapian_is_null (iter)) do { ++count; } while (mu_msg_iter_xapian_next (iter)); - g_print ("[%s][%d,%d]\n", queries[i].query,queries[i].count,count); g_assert_cmpuint (queries[i].count, ==, count); mu_msg_iter_xapian_destroy (iter); } @@ -103,6 +99,32 @@ test_mu_query_01 (void) g_free (xpath); } + +static void +test_mu_query_02 (void) +{ + MuMsgIterXapian *iter; + MuQueryXapian *query; + const char* q; + gchar *xpath; + int i; + + xpath = fill_database (); + g_assert (xpath != NULL); + + query = mu_query_xapian_new (xpath); + g_assert (query); + + q = "3BE9E6535E3029448670913581E7A1A20D852173@emss35m06.us.lmco.com"; + iter = mu_query_xapian_run (query, q, NULL, FALSE, 0); + g_assert (!mu_msg_iter_xapian_is_null (iter)); + + mu_query_xapian_destroy (query); + g_free (xpath); +} + + + int main (int argc, char *argv[]) { @@ -111,6 +133,11 @@ main (int argc, char *argv[]) /* mu_util_maildir_mkmdir */ g_test_add_func ("/mu-query/test-mu-query-01", test_mu_query_01); + /* mu_util_maildir_mkmdir */ + g_test_add_func ("/mu-query/test-mu-query-02", + test_mu_query_02); + + g_log_set_handler (NULL, G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION, diff --git a/src/tests/test-mu-util.c b/src/tests/test-mu-util.c index 41d017f5..bc51e547 100644 --- a/src/tests/test-mu-util.c +++ b/src/tests/test-mu-util.c @@ -153,6 +153,35 @@ test_mu_util_check_dir_04 (void) } +static void +test_mu_util_str_from_strv_01 (void) +{ + const gchar *strv[] = { "aap", "noot", "mies", NULL }; + gchar *str = mu_util_str_from_strv (strv); + g_assert_cmpstr (str, ==, "aap noot mies"); + g_free (str); + +} + +static void +test_mu_util_str_from_strv_02 (void) +{ + const gchar *strv[] = { "test", NULL }; + gchar *str = mu_util_str_from_strv (strv); + g_assert_cmpstr (str, ==, "test"); + g_free (str); + +} + +static void +test_mu_util_str_from_strv_03 (void) +{ + const gchar *strv[] = { NULL }; + gchar *str = mu_util_str_from_strv (strv); + g_assert_cmpstr (str, ==, ""); + g_free (str); +} + @@ -186,7 +215,14 @@ main (int argc, char *argv[]) test_mu_util_check_dir_03); g_test_add_func ("/mu-util/mu-util-check-dir-04", test_mu_util_check_dir_04); - + + /* test_mu_util_str_from_strv */ + g_test_add_func ("/mu-util/mu-util-str-from-strv-01", + test_mu_util_str_from_strv_01); + g_test_add_func ("/mu-util/mu-util-str-from-strv-02", + test_mu_util_str_from_strv_02); + g_test_add_func ("/mu-util/mu-util-str-from-strv-03", + test_mu_util_str_from_strv_03); g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG|