From 39101cf583bbf81a8f78e25981733fee2a8bbf39 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Tue, 28 Mar 2023 22:26:56 +0300 Subject: [PATCH] mu-find: brush off --format=links unit test Enable it by default, and modernize it a little bit --- lib/utils/mu-test-utils.hh | 8 ++++-- mu/tests/test-mu-cmd.cc | 59 +++++++++++++++++++------------------- 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/lib/utils/mu-test-utils.hh b/lib/utils/mu-test-utils.hh index c59b9d5a..ffb0662c 100644 --- a/lib/utils/mu-test-utils.hh +++ b/lib/utils/mu-test-utils.hh @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2022 Dirk-Jan C. Binnema +** Copyright (C) 2008-2023 Dirk-Jan C. Binnema ** ** This program is free software; you can redistribute it and/or modify it ** under the terms of the GNU General Public License as published by the @@ -21,6 +21,7 @@ #define MU_TEST_UTILS_HH__ #include +#include namespace Mu { @@ -29,7 +30,10 @@ namespace Mu { * * @return a random dir name, g_free when it's no longer needed */ -char* test_mu_common_get_random_tmpdir(); +char* test_mu_common_get_random_tmpdir(void); +static inline std::string test_random_tmpdir() { + return to_string_gchar(test_mu_common_get_random_tmpdir()); +} /** * mu wrapper for g_test_init diff --git a/mu/tests/test-mu-cmd.cc b/mu/tests/test-mu-cmd.cc index d70cc80d..4d19806d 100644 --- a/mu/tests/test-mu-cmd.cc +++ b/mu/tests/test-mu-cmd.cc @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -33,6 +34,7 @@ #include "mu-query.hh" #include "utils/mu-result.hh" #include "utils/mu-utils.hh" +#include "utils/mu-utils-file.hh" using namespace Mu; @@ -227,59 +229,59 @@ test_mu_find_03() g_free(cmdline); } -G_GNUC_UNUSED static void +static void test_mu_find_links(void) { - gchar *cmdline, *output, *erroutput, *tmpdir; - - tmpdir = test_mu_common_get_random_tmpdir(); - - cmdline = g_strdup_printf("%s find --muhome=%s --format=links --linksdir=%s " - "mime:message/rfc822", - MU_PROGRAM, - DBPATH.c_str(), - tmpdir); - + char *output, *erroutput; + const auto tmpdir{test_random_tmpdir()}; + auto cmdline = format("%s find --muhome=%s --format=links --linksdir=%s " + "mime:message/rfc822", MU_PROGRAM, DBPATH.c_str(), tmpdir.c_str()); if (g_test_verbose()) - g_print("cmdline: %s\n", cmdline); + g_print("cmdline: %s\n", cmdline.c_str()); - g_assert(g_spawn_command_line_sync(cmdline, &output, &erroutput, NULL, NULL)); + g_assert(g_spawn_command_line_sync(cmdline.c_str(), &output, &erroutput, NULL, NULL)); /* there should be no errors */ g_assert_cmpuint(newlines_in_output(output), ==, 0); g_assert_cmpuint(newlines_in_output(erroutput), ==, 0); g_free(output); g_free(erroutput); + output = erroutput = NULL; + + /* furthermore, two symlinks should be there */ + const auto f1{format("%s/cur/3419760385_rfc822.1", tmpdir.c_str())}; + const auto f2{format("%s/cur/3419760386_rfc822.2", tmpdir.c_str())}; + + g_assert_cmpuint(determine_dtype(f1.c_str(), true), ==, DT_LNK); + g_assert_cmpuint(determine_dtype(f2.c_str(), true), ==, DT_LNK); /* now we try again, we should get a line of error output, * when we find the first target file already exists */ if (g_test_verbose()) - g_print("cmdline: %s\n", cmdline); + g_print("cmdline: %s\n", cmdline.c_str()); - g_assert(g_spawn_command_line_sync(cmdline, &output, &erroutput, NULL, NULL)); + g_assert(g_spawn_command_line_sync(cmdline.c_str(), &output, &erroutput, NULL, NULL)); g_assert_cmpuint(newlines_in_output(output), ==, 0); g_assert_cmpuint(newlines_in_output(erroutput), ==, 1); g_free(output); g_free(erroutput); + output = erroutput = NULL; /* now we try again with --clearlinks, and the we should be * back to 0 errors */ - g_free(cmdline); - cmdline = g_strdup_printf("%s find --muhome=%s --format=links --linksdir=%s --clearlinks " - "mime:message/rfc822", - MU_PROGRAM, - DBPATH.c_str(), - tmpdir); - g_assert(g_spawn_command_line_sync(cmdline, &output, &erroutput, NULL, NULL)); + cmdline = format("%s find --muhome=%s --format=links --linksdir=%s --clearlinks " + "mime:message/rfc822", MU_PROGRAM, DBPATH.c_str(), tmpdir.c_str()); + + g_assert(g_spawn_command_line_sync(cmdline.c_str(), &output, &erroutput, NULL, NULL)); if (g_test_verbose()) - g_print("cmdline: %s\n", cmdline); + g_print("cmdline: %s\n", cmdline.c_str()); g_assert_cmpuint(newlines_in_output(output), ==, 0); g_assert_cmpuint(newlines_in_output(erroutput), ==, 0); g_free(output); g_free(erroutput); - g_free(cmdline); - g_free(tmpdir); + g_assert_cmpuint(determine_dtype(f1.c_str(), true), ==, DT_LNK); + g_assert_cmpuint(determine_dtype(f2.c_str(), true), ==, DT_LNK); } /* some more tests */ @@ -837,11 +839,8 @@ main(int argc, char* argv[]) g_test_add_func("/mu-cmd/test-mu-find-file", test_mu_find_file); g_test_add_func("/mu-cmd/test-mu-find-mime", test_mu_find_mime); - /* recently, this test breaks _sometimes_ when run on Travis; but it - * seems related to the setup there, as nothing has changed in the code. - * turn off for now. */ - /* g_test_add_func ("/mu-cmd/test-mu-find-links", - * test_mu_find_links); */ + + g_test_add_func ("/mu-cmd/test-mu-find-links", test_mu_find_links); g_test_add_func("/mu-cmd/test-mu-find-text-in-rfc822", test_mu_find_text_in_rfc822);