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

tests: threads: Extract helper for checking thread info for each message

Browse Source
This commit is contained in:
Jakub Sitnicki
2014-07-15 07:19:25 +02:00
parent 4c4b9af762
commit 80a484dc3f
1 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
mu/tests/test-mu-threads.c
View File

@ -73,6 +73,26 @@ tinfo_init_from_iter (tinfo *item, MuMsgIter *iter)
} }
static void
foreach_assert_tinfo_equal (MuMsgIter *iter, const tinfo items[], guint n_items)
{
guint u;
u = 0;
while (!mu_msg_iter_is_done (iter) && u < n_items) {
tinfo ti;
tinfo_init_from_iter (&ti, iter);
g_assert (u < n_items);
assert_tinfo_equal (&items[u], &ti);
++u;
mu_msg_iter_next (iter);
}
g_assert (u == n_items);
}
static gchar* static gchar*
fill_database (const char *testdir) fill_database (const char *testdir)
{ {
@ -118,13 +138,11 @@ run_and_get_iter (const char *xpath, const char *query)
return iter; return iter;
} }
static void static void
test_mu_threads_01 (void) test_mu_threads_01 (void)
{ {
gchar *xpath; gchar *xpath;
MuMsgIter *iter; MuMsgIter *iter;
unsigned u;
const tinfo items [] = { const tinfo items [] = {
{"0", "root0@msg.id", "root0"}, {"0", "root0@msg.id", "root0"},
@ -150,19 +168,7 @@ test_mu_threads_01 (void)
g_assert (iter); g_assert (iter);
g_assert (!mu_msg_iter_is_done(iter)); g_assert (!mu_msg_iter_is_done(iter));
u = 0; foreach_assert_tinfo_equal (iter, items, G_N_ELEMENTS (items));
while (!mu_msg_iter_is_done (iter) && u < G_N_ELEMENTS(items)) {
tinfo ti;
tinfo_init_from_iter (&ti, iter);
g_assert (u < G_N_ELEMENTS(items));
assert_tinfo_equal (&items[u], &ti);
++u;
mu_msg_iter_next (iter);
}
g_assert (u == G_N_ELEMENTS(items));
g_free (xpath); g_free (xpath);
mu_msg_iter_destroy (iter); mu_msg_iter_destroy (iter);
@ -173,7 +179,6 @@ test_mu_threads_rogue (void)
{ {
gchar *xpath; gchar *xpath;
MuMsgIter *iter; MuMsgIter *iter;
unsigned u;
tinfo *items; tinfo *items;
tinfo items1 [] = { tinfo items1 [] = {
@ -205,19 +210,7 @@ test_mu_threads_rogue (void)
else else
items = items2; items = items2;
u = 0; foreach_assert_tinfo_equal (iter, items, G_N_ELEMENTS (items1));
while (!mu_msg_iter_is_done (iter) && u < G_N_ELEMENTS(items1)) {
tinfo ti;
tinfo_init_from_iter (&ti, iter);
g_assert (u < G_N_ELEMENTS(items1));
assert_tinfo_equal (&items[u], &ti);
++u;
mu_msg_iter_next (iter);
}
g_assert (u == G_N_ELEMENTS(items1));
g_free (xpath); g_free (xpath);
mu_msg_iter_destroy (iter); mu_msg_iter_destroy (iter);