alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu/tests: use absolute paths; speed up mu cfind tests

Browse Source
This commit is contained in:
djcb
2012-09-15 18:03:58 +03:00
parent 87e61b7a3e
commit c46024cfda
2 changed files with 32 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mu/tests/Makefile.am
View File

@ -22,10 +22,10 @@ INCLUDES=$(XAPIAN_CXXFLAGS) \
-I ${top_srcdir} \ -I ${top_srcdir} \
-I ${top_srcdir}/lib \ -I ${top_srcdir}/lib \
-I ${top_srcdir}/lib/tests \ -I ${top_srcdir}/lib/tests \
-DMU_TESTMAILDIR=\"${top_srcdir}/lib/tests/testdir\" \ -DMU_TESTMAILDIR=\"${abs_top_srcdir}/lib/tests/testdir\" \
-DMU_TESTMAILDIR2=\"${top_srcdir}/lib/tests/testdir2\" \ -DMU_TESTMAILDIR2=\"${abs_top_srcdir}/lib/tests/testdir2\" \
-DMU_TESTMAILDIR3=\"${top_srcdir}/lib/tests/testdir3\" \ -DMU_TESTMAILDIR3=\"${abs_top_srcdir}/lib/tests/testdir3\" \
-DMU_TESTMAILDIR4=\"${top_srcdir}/lib/tests/testdir4\" \ -DMU_TESTMAILDIR4=\"${abs_top_srcdir}/lib/tests/testdir4\" \
-DMU_PROGRAM=\"${abs_top_builddir}/mu/mu\" \ -DMU_PROGRAM=\"${abs_top_builddir}/mu/mu\" \
-DABS_CURDIR=\"${abs_builddir}\" \ -DABS_CURDIR=\"${abs_builddir}\" \
-DABS_SRCDIR=\"${abs_srcdir}\" -DABS_SRCDIR=\"${abs_srcdir}\"

67
mu/tests/test-mu-cmd-cfind.c
View File

@ -34,7 +34,7 @@
#include "test-mu-common.h" #include "test-mu-common.h"
#include "mu-store.h" #include "mu-store.h"
static gchar *CONTACTS_CACHE = NULL;
static gchar* static gchar*
fill_contacts_cache (void) fill_contacts_cache (void)
@ -64,18 +64,14 @@ fill_contacts_cache (void)
static void static void
test_mu_cfind_plain (void) test_mu_cfind_plain (void)
{ {
gchar *muhome, *cmdline, *output, *erroutput; gchar *cmdline, *output, *erroutput;
muhome = fill_contacts_cache ();
g_assert (muhome != NULL);
cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=plain " cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=plain "
"'testmu\\.xxx?'", "'testmu\\.xxx?'",
MU_PROGRAM, muhome); MU_PROGRAM, CONTACTS_CACHE);
if (g_test_verbose()) if (g_test_verbose())
g_print ("%s\n", cmdline); g_print ("%s\n", cmdline);
output = erroutput = NULL; output = erroutput = NULL;
g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput, g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput,
NULL, NULL)); NULL, NULL));
@ -93,7 +89,6 @@ test_mu_cfind_plain (void)
"Mü testmu@testmu.xx\n" "Mü testmu@testmu.xx\n"
"Helmut Kröger hk@testmu.xxx\n"); "Helmut Kröger hk@testmu.xxx\n");
g_free (cmdline); g_free (cmdline);
g_free (muhome);
g_free (output); g_free (output);
g_free (erroutput); g_free (erroutput);
} }
@ -101,7 +96,7 @@ test_mu_cfind_plain (void)
static void static void
test_mu_cfind_bbdb (void) test_mu_cfind_bbdb (void)
{ {
gchar *muhome, *cmdline, *output, *erroutput, *expected; gchar *cmdline, *output, *erroutput, *expected;
gchar today[12]; gchar today[12];
const char* frm1; const char* frm1;
const char *frm2; const char *frm2;
@ -109,14 +104,11 @@ test_mu_cfind_bbdb (void)
time_t now; time_t now;
const char *old_tz; const char *old_tz;
muhome = fill_contacts_cache ();
g_assert (muhome != NULL);
old_tz = set_tz ("Europe/Helsinki"); old_tz = set_tz ("Europe/Helsinki");
cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=bbdb " cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=bbdb "
"'testmu\\.xxx?'", "'testmu\\.xxx?'",
MU_PROGRAM, muhome); MU_PROGRAM, CONTACTS_CACHE);
output = erroutput = NULL; output = erroutput = NULL;
g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput, g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput,
@ -155,7 +147,6 @@ test_mu_cfind_bbdb (void)
g_assert_cmpstr (output, ==, expected); g_assert_cmpstr (output, ==, expected);
g_free (cmdline); g_free (cmdline);
g_free (muhome);
g_free (output); g_free (output);
g_free (erroutput); g_free (erroutput);
g_free (expected); g_free (expected);
@ -167,14 +158,11 @@ test_mu_cfind_bbdb (void)
static void static void
test_mu_cfind_wl (void) test_mu_cfind_wl (void)
{ {
gchar *muhome, *cmdline, *output, *erroutput; gchar *cmdline, *output, *erroutput;
muhome = fill_contacts_cache ();
g_assert (muhome != NULL);
cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=wl " cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=wl "
"'testmu\\.xxx?'", "'testmu\\.xxx?'",
MU_PROGRAM, muhome); MU_PROGRAM, CONTACTS_CACHE);
output = erroutput = NULL; output = erroutput = NULL;
g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput, g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput,
@ -193,7 +181,6 @@ test_mu_cfind_wl (void)
"hk@testmu.xxx \"HelmutK\" \"Helmut Kröger\"\n"); "hk@testmu.xxx \"HelmutK\" \"Helmut Kröger\"\n");
g_free (cmdline); g_free (cmdline);
g_free (muhome);
g_free (output); g_free (output);
g_free (erroutput); g_free (erroutput);
} }
@ -202,14 +189,11 @@ test_mu_cfind_wl (void)
static void static void
test_mu_cfind_mutt_alias (void) test_mu_cfind_mutt_alias (void)
{ {
gchar *muhome, *cmdline, *output, *erroutput; gchar *cmdline, *output, *erroutput;
muhome = fill_contacts_cache ();
g_assert (muhome != NULL);
cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=mutt-alias " cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=mutt-alias "
"'testmu\\.xxx?'", "'testmu\\.xxx?'",
MU_PROGRAM, muhome); MU_PROGRAM, CONTACTS_CACHE);
output = erroutput = NULL; output = erroutput = NULL;
g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput, g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput,
@ -231,7 +215,6 @@ test_mu_cfind_mutt_alias (void)
g_free (cmdline); g_free (cmdline);
g_free (muhome);
g_free (output); g_free (output);
g_free (erroutput); g_free (erroutput);
} }
@ -239,14 +222,11 @@ test_mu_cfind_mutt_alias (void)
static void static void
test_mu_cfind_mutt_ab (void) test_mu_cfind_mutt_ab (void)
{ {
gchar *muhome, *cmdline, *output, *erroutput; gchar *cmdline, *output, *erroutput;
muhome = fill_contacts_cache ();
g_assert (muhome != NULL);
cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=mutt-ab " cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=mutt-ab "
"'testmu\\.xxx?'", "'testmu\\.xxx?'",
MU_PROGRAM, muhome); MU_PROGRAM, CONTACTS_CACHE);
output = erroutput = NULL; output = erroutput = NULL;
g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput, g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput,
@ -267,7 +247,6 @@ test_mu_cfind_mutt_ab (void)
"hk@testmu.xxx\tHelmut Kröger\t\n"); "hk@testmu.xxx\tHelmut Kröger\t\n");
g_free (cmdline); g_free (cmdline);
g_free (muhome);
g_free (output); g_free (output);
g_free (erroutput); g_free (erroutput);
} }
@ -276,14 +255,11 @@ test_mu_cfind_mutt_ab (void)
static void static void
test_mu_cfind_org_contact (void) test_mu_cfind_org_contact (void)
{ {
gchar *muhome, *cmdline, *output, *erroutput; gchar*cmdline, *output, *erroutput;
muhome = fill_contacts_cache ();
g_assert (muhome != NULL);
cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=org-contact " cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=org-contact "
"'testmu\\.xxx?'", "'testmu\\.xxx?'",
MU_PROGRAM, muhome); MU_PROGRAM, CONTACTS_CACHE);
output = erroutput = NULL; output = erroutput = NULL;
g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput, g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput,
@ -316,7 +292,6 @@ test_mu_cfind_org_contact (void)
g_free (cmdline); g_free (cmdline);
g_free (muhome);
g_free (output); g_free (output);
g_free (erroutput); g_free (erroutput);
} }
@ -326,14 +301,11 @@ test_mu_cfind_org_contact (void)
static void static void
test_mu_cfind_csv (void) test_mu_cfind_csv (void)
{ {
gchar *muhome, *cmdline, *output, *erroutput; gchar *cmdline, *output, *erroutput;
muhome = fill_contacts_cache ();
g_assert (muhome != NULL);
cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=csv " cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=csv "
"'testmu\\.xxx?'", "'testmu\\.xxx?'",
MU_PROGRAM, muhome); MU_PROGRAM, CONTACTS_CACHE);
output = erroutput = NULL; output = erroutput = NULL;
g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput, g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput,
@ -349,11 +321,7 @@ test_mu_cfind_csv (void)
==, ==,
"Mü,testmu@testmu.xx\n" "Mü,testmu@testmu.xx\n"
"Helmut Kröger,hk@testmu.xxx\n"); "Helmut Kröger,hk@testmu.xxx\n");
g_free (cmdline); g_free (cmdline);
g_free (muhome);
g_free (output); g_free (output);
g_free (erroutput); g_free (erroutput);
} }
@ -368,6 +336,8 @@ main (int argc, char *argv[])
if (!set_en_us_utf8_locale()) if (!set_en_us_utf8_locale())
return 0; /* don't error out... */ return 0; /* don't error out... */
CONTACTS_CACHE = fill_contacts_cache ();
g_test_add_func ("/mu-cmd-cfind/test-mu-cfind-plain", test_mu_cfind_plain); g_test_add_func ("/mu-cmd-cfind/test-mu-cfind-plain", test_mu_cfind_plain);
g_test_add_func ("/mu-cmd-cfind/test-mu-cfind-bbdb", test_mu_cfind_bbdb); g_test_add_func ("/mu-cmd-cfind/test-mu-cfind-bbdb", test_mu_cfind_bbdb);
g_test_add_func ("/mu-cmd-cfind/test-mu-cfind-wl", test_mu_cfind_wl); g_test_add_func ("/mu-cmd-cfind/test-mu-cfind-wl", test_mu_cfind_wl);
@ -387,5 +357,8 @@ main (int argc, char *argv[])
rv = g_test_run (); rv = g_test_run ();
g_free (CONTACTS_CACHE);
CONTACTS_CACHE = NULL;
return rv; return rv;
} }