From 8b66491a72af363d47258a7cad6094b230b0aa07 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Tue, 18 Jul 2023 21:33:33 +0300 Subject: [PATCH] mu-add: update unit test --- mu/mu-cmd-add.cc | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/mu/mu-cmd-add.cc b/mu/mu-cmd-add.cc index 7e57fe04..5ad79baa 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);