summaryrefslogtreecommitdiff
path: root/mu/mu-cmd-add.cc
diff options
context:
space:
mode:
authorDirk-Jan C. Binnema <djcb@djcbsoftware.nl>2023-07-18 21:33:33 +0300
committerDirk-Jan C. Binnema <djcb@djcbsoftware.nl>2023-07-18 21:33:33 +0300
commit8b66491a72af363d47258a7cad6094b230b0aa07 (patch)
tree115acb0afb3d0303505822ae630913df276284a8 /mu/mu-cmd-add.cc
parentcf6c5a36d7aa38377bce8c03fc7929ffb5328766 (diff)
mu-add: update unit test
Diffstat (limited to 'mu/mu-cmd-add.cc')
-rw-r--r--mu/mu-cmd-add.cc34
1 files changed, 12 insertions, 22 deletions
diff --git a/mu/mu-cmd-add.cc b/mu/mu-cmd-add.cc
index 7e57fe0..5ad79ba 100644
--- a/mu/mu-cmd-add.cc
+++ b/mu/mu-cmd-add.cc
@@ -56,12 +56,9 @@ test_add_ok()
}
{
- auto res = run_mu_command(
- mu_format("add --muhome={} {}",
- testhome,
- MU_TESTMAILDIR "/cur/1220863042.12663_1.mindcrime!2,S"));
- assert_valid_result(res);
- g_assert_cmpuint(*res,==,0);
+ auto res = run_command({MU_PROGRAM, "add", mu_format("--muhome={}", testhome),
+ MU_TESTMAILDIR "/cur/1220863042.12663_1.mindcrime!2,S"});
+ assert_valid_command(res);
}
{
@@ -71,15 +68,11 @@ test_add_ok()
}
{ // re-add the same
- auto res = run_mu_command(
- mu_format("add --muhome={} {}",
- testhome,
- MU_TESTMAILDIR "/cur/1220863042.12663_1.mindcrime!2,S"));
- assert_valid_result(res);
- g_assert_cmpuint(*res,==,0);
+ auto res = run_command({MU_PROGRAM, "add", mu_format("--muhome={}",testhome),
+ MU_TESTMAILDIR "/cur/1220863042.12663_1.mindcrime!2,S"});
+ assert_valid_command(res);
}
-
{
auto&& store = Store::make(dbpath);
assert_valid_result(store);
@@ -101,21 +94,18 @@ test_add_fail()
}
{ // wrong maildir
- auto res = run_mu_command(
- mu_format("add --muhome={} {}",
- testhome,
- MU_TESTMAILDIR "/cur/1220863042.12663_1.mindcrime!2,S"));
+ auto res = run_command({MU_PROGRAM, "add", mu_format("--muhome={}", testhome),
+ MU_TESTMAILDIR "/cur/1220863042.12663_1.mindcrime!2,S"});
assert_valid_result(res);
- g_assert_cmpuint(*res,!=,0);
+ g_assert_cmpuint(res->exit_code,!=,0);
}
{ // non-existent
- auto res = run_mu_command(
- mu_format("add --muhome={} {}",
- testhome, "/foo/bar/non-existent"));
+ auto res = run_command({MU_PROGRAM, "add", mu_format("--muhome={}", testhome),
+ "/foo/bar/non-existent"});
assert_valid_result(res);
- g_assert_cmpuint(*res,!=,0);
+ g_assert_cmpuint(res->exit_code,!=,0);
}
remove_directory(testhome);