emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* test-mu-util.c: fix test_mu_util_dir_expand_03 for the symlink case

This commit is contained in:
djcb 2012-03-08 00:10:21 +02:00
parent f02bb34188
commit 0d3f1887da
1 changed files with 115 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

226
src/tests/test-mu-util.c
View File

@ -1,5 +1,5 @@
/* /*
** Copyright (C) 2008-2010 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ** Copyright (C) 2008-2012 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** **
** This program is free software; you can redistribute it and/or modify it ** 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 ** under the terms of the GNU General Public License as published by the
@ -26,6 +26,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <limits.h>
#include "test-mu-common.h" #include "test-mu-common.h"
#include "src/mu-util.h" #include "src/mu-util.h"
@ -33,32 +34,32 @@
static void static void
test_mu_util_dir_expand_00 (void) test_mu_util_dir_expand_00 (void)
{ {
gchar *got, *expected; gchar *got, *expected;
got = mu_util_dir_expand ("~/IProbablyDoNotExist"); got = mu_util_dir_expand ("~/IProbablyDoNotExist");
expected = g_strdup_printf ("%s%cIProbablyDoNotExist", expected = g_strdup_printf ("%s%cIProbablyDoNotExist",
getenv("HOME"), G_DIR_SEPARATOR); getenv("HOME"), G_DIR_SEPARATOR);
g_assert_cmpstr (got,==,expected); g_assert_cmpstr (got,==,expected);
g_free (got); g_free (got);
g_free (expected); g_free (expected);
} }
static void static void
test_mu_util_dir_expand_01 (void) test_mu_util_dir_expand_01 (void)
{ {
gchar *got, *expected; gchar *got, *expected;
got = mu_util_dir_expand ("~/Desktop"); got = mu_util_dir_expand ("~/Desktop");
expected = g_strdup_printf ("%s%cDesktop", expected = g_strdup_printf ("%s%cDesktop",
getenv("HOME"), G_DIR_SEPARATOR); getenv("HOME"), G_DIR_SEPARATOR);
g_assert_cmpstr (got,==,expected); g_assert_cmpstr (got,==,expected);
g_free (got); g_free (got);
g_free (expected); g_free (expected);
} }
@ -66,12 +67,15 @@ test_mu_util_dir_expand_01 (void)
static void static void
test_mu_util_dir_expand_03 (void) test_mu_util_dir_expand_03 (void)
{ {
gchar *got; gchar *got;
gchar curdir[PATH_MAX + 1];
got = mu_util_dir_expand ("."); realpath (ABS_CURDIR, curdir);
g_assert_cmpstr (got,==,ABS_CURDIR);
g_free (got); got = mu_util_dir_expand (".");
g_assert_cmpstr (got, ==, curdir);
g_free (got);
} }
@ -80,131 +84,131 @@ test_mu_util_dir_expand_03 (void)
static void static void
test_mu_util_guess_maildir_01 (void) test_mu_util_guess_maildir_01 (void)
{ {
char *got; char *got;
const char *expected; const char *expected;
/* skip the test if there's no /tmp */ /* skip the test if there's no /tmp */
if (access ("/tmp", F_OK)) if (access ("/tmp", F_OK))
return; return;
g_setenv ("MAILDIR", "/tmp", TRUE); g_setenv ("MAILDIR", "/tmp", TRUE);
got = mu_util_guess_maildir (); got = mu_util_guess_maildir ();
expected = "/tmp"; expected = "/tmp";
g_assert_cmpstr (got,==,expected); g_assert_cmpstr (got,==,expected);
g_free (got); g_free (got);
} }
static void static void
test_mu_util_guess_maildir_02 (void) test_mu_util_guess_maildir_02 (void)
{ {
char *got, *mdir; char *got, *mdir;
g_unsetenv ("MAILDIR"); g_unsetenv ("MAILDIR");
mdir = g_strdup_printf ("%s%cMaildir", mdir = g_strdup_printf ("%s%cMaildir",
getenv("HOME"), G_DIR_SEPARATOR); getenv("HOME"), G_DIR_SEPARATOR);
got = mu_util_guess_maildir (); got = mu_util_guess_maildir ();
if (access (mdir, F_OK) == 0) if (access (mdir, F_OK) == 0)
g_assert_cmpstr (got, ==, mdir); g_assert_cmpstr (got, ==, mdir);
else else
g_assert_cmpstr (got, == , NULL); g_assert_cmpstr (got, == , NULL);
g_free (got); g_free (got);
g_free (mdir); g_free (mdir);
} }
static void static void
test_mu_util_check_dir_01 (void) test_mu_util_check_dir_01 (void)
{ {
if (g_access ("/usr/bin", F_OK) == 0) { if (g_access ("/usr/bin", F_OK) == 0) {
g_assert_cmpuint ( g_assert_cmpuint (
mu_util_check_dir ("/usr/bin", TRUE, FALSE) == TRUE, mu_util_check_dir ("/usr/bin", TRUE, FALSE) == TRUE,
==, ==,
g_access ("/usr/bin", R_OK) == 0); g_access ("/usr/bin", R_OK) == 0);
} }
} }
static void static void
test_mu_util_check_dir_02 (void) test_mu_util_check_dir_02 (void)
{ {
if (g_access ("/tmp", F_OK) == 0) { if (g_access ("/tmp", F_OK) == 0) {
g_assert_cmpuint ( g_assert_cmpuint (
mu_util_check_dir ("/tmp", FALSE, TRUE) == TRUE, mu_util_check_dir ("/tmp", FALSE, TRUE) == TRUE,
==, ==,
g_access ("/tmp", W_OK) == 0); g_access ("/tmp", W_OK) == 0);
} }
} }
static void static void
test_mu_util_check_dir_03 (void) test_mu_util_check_dir_03 (void)
{ {
if (g_access (".", F_OK) == 0) { if (g_access (".", F_OK) == 0) {
g_assert_cmpuint ( g_assert_cmpuint (
mu_util_check_dir (".", TRUE, TRUE) == TRUE, mu_util_check_dir (".", TRUE, TRUE) == TRUE,
==, ==,
g_access (".", W_OK | R_OK) == 0); g_access (".", W_OK | R_OK) == 0);
} }
} }
static void static void
test_mu_util_check_dir_04 (void) test_mu_util_check_dir_04 (void)
{ {
/* not a dir, so it must be false */ /* not a dir, so it must be false */
g_assert_cmpuint ( g_assert_cmpuint (
mu_util_check_dir ("test-util.c", TRUE, TRUE), mu_util_check_dir ("test-util.c", TRUE, TRUE),
==, ==,
FALSE); FALSE);
} }
static void static void
test_mu_util_str_from_strv_01 (void) test_mu_util_str_from_strv_01 (void)
{ {
const gchar *strv[] = { "aap", "noot", "mies", NULL }; const gchar *strv[] = { "aap", "noot", "mies", NULL };
gchar *str = mu_util_str_from_strv (strv); gchar *str = mu_util_str_from_strv (strv);
g_assert_cmpstr (str, ==, "aap noot mies"); g_assert_cmpstr (str, ==, "aap noot mies");
g_free (str); g_free (str);
} }
static void static void
test_mu_util_str_from_strv_02 (void) test_mu_util_str_from_strv_02 (void)
{ {
const gchar *strv[] = { "test", NULL }; const gchar *strv[] = { "test", NULL };
gchar *str = mu_util_str_from_strv (strv); gchar *str = mu_util_str_from_strv (strv);
g_assert_cmpstr (str, ==, "test"); g_assert_cmpstr (str, ==, "test");
g_free (str); g_free (str);
} }
static void static void
test_mu_util_str_from_strv_03 (void) test_mu_util_str_from_strv_03 (void)
{ {
const gchar *strv[] = { NULL }; const gchar *strv[] = { NULL };
gchar *str = mu_util_str_from_strv (strv); gchar *str = mu_util_str_from_strv (strv);
g_assert_cmpstr (str, ==, ""); g_assert_cmpstr (str, ==, "");
g_free (str); g_free (str);
} }
static void static void
test_mu_util_get_dtype_with_lstat (void) test_mu_util_get_dtype_with_lstat (void)
{ {
g_assert_cmpuint ( g_assert_cmpuint (
mu_util_get_dtype_with_lstat (MU_TESTMAILDIR), ==, DT_DIR); mu_util_get_dtype_with_lstat (MU_TESTMAILDIR), ==, DT_DIR);
g_assert_cmpuint ( g_assert_cmpuint (
mu_util_get_dtype_with_lstat (MU_TESTMAILDIR2), ==, DT_DIR); mu_util_get_dtype_with_lstat (MU_TESTMAILDIR2), ==, DT_DIR);
g_assert_cmpuint ( g_assert_cmpuint (
mu_util_get_dtype_with_lstat (MU_TESTMAILDIR2 "Foo/cur/mail5"), mu_util_get_dtype_with_lstat (MU_TESTMAILDIR2 "Foo/cur/mail5"),
==, DT_REG); ==, DT_REG);
} }
@ -212,40 +216,40 @@ test_mu_util_get_dtype_with_lstat (void)
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
/* mu_util_dir_expand */ /* mu_util_dir_expand */
g_test_add_func ("/mu-util/mu-util-dir-expand-00", test_mu_util_dir_expand_00); g_test_add_func ("/mu-util/mu-util-dir-expand-00", test_mu_util_dir_expand_00);
g_test_add_func ("/mu-util/mu-util-dir-expand-01", test_mu_util_dir_expand_01); g_test_add_func ("/mu-util/mu-util-dir-expand-01", test_mu_util_dir_expand_01);
g_test_add_func ("/mu-util/mu-util-dir-expand-03", test_mu_util_dir_expand_03); g_test_add_func ("/mu-util/mu-util-dir-expand-03", test_mu_util_dir_expand_03);
/* mu_util_guess_maildir */ /* mu_util_guess_maildir */
g_test_add_func ("/mu-util/mu-util-guess-maildir-01", g_test_add_func ("/mu-util/mu-util-guess-maildir-01",
test_mu_util_guess_maildir_01); test_mu_util_guess_maildir_01);
g_test_add_func ("/mu-util/mu-util-guess-maildir-02", g_test_add_func ("/mu-util/mu-util-guess-maildir-02",
test_mu_util_guess_maildir_02); test_mu_util_guess_maildir_02);
/* mu_util_check_dir */ /* mu_util_check_dir */
g_test_add_func ("/mu-util/mu-util-check-dir-01", test_mu_util_check_dir_01); g_test_add_func ("/mu-util/mu-util-check-dir-01", test_mu_util_check_dir_01);
g_test_add_func ("/mu-util/mu-util-check-dir-02", test_mu_util_check_dir_02); g_test_add_func ("/mu-util/mu-util-check-dir-02", test_mu_util_check_dir_02);
g_test_add_func ("/mu-util/mu-util-check-dir-03", test_mu_util_check_dir_03); g_test_add_func ("/mu-util/mu-util-check-dir-03", test_mu_util_check_dir_03);
g_test_add_func ("/mu-util/mu-util-check-dir-04", test_mu_util_check_dir_04); g_test_add_func ("/mu-util/mu-util-check-dir-04", test_mu_util_check_dir_04);
/* test_mu_util_str_from_strv */ /* test_mu_util_str_from_strv */
g_test_add_func ("/mu-util/mu-util-str-from-strv-01", g_test_add_func ("/mu-util/mu-util-str-from-strv-01",
test_mu_util_str_from_strv_01); test_mu_util_str_from_strv_01);
g_test_add_func ("/mu-util/mu-util-str-from-strv-02", g_test_add_func ("/mu-util/mu-util-str-from-strv-02",
test_mu_util_str_from_strv_02); test_mu_util_str_from_strv_02);
g_test_add_func ("/mu-util/mu-util-str-from-strv-03", g_test_add_func ("/mu-util/mu-util-str-from-strv-03",
test_mu_util_str_from_strv_03); test_mu_util_str_from_strv_03);
g_test_add_func ("/mu-util/mu-util-get-dtype-with-lstat", g_test_add_func ("/mu-util/mu-util-get-dtype-with-lstat",
test_mu_util_get_dtype_with_lstat); test_mu_util_get_dtype_with_lstat);
g_log_set_handler (NULL, g_log_set_handler (NULL,
G_LOG_LEVEL_DEBUG| G_LOG_LEVEL_DEBUG|
G_LOG_LEVEL_MESSAGE| G_LOG_LEVEL_MESSAGE|
G_LOG_LEVEL_INFO, (GLogFunc)black_hole, NULL); G_LOG_LEVEL_INFO, (GLogFunc)black_hole, NULL);
return g_test_run (); return g_test_run ();
} }