X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftest%2Ftest-path-util.c;h=82090ce99f51d4d9b7c45e2d388938c492783c8b;hp=01afb3e6feed6c45aaabdb72b951524e7c496635;hb=adeba5008eac3105ae59256dedd087ebe006a9e6;hpb=8d95631ea6c039a60bb7ac456f687a8fdf0c4381 diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index 01afb3e6f..82090ce99 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -163,17 +163,24 @@ static void test_prefixes(void) { } static void test_path_join(void) { - assert_se(streq(path_join("/root", "/a/b", "/c"), "/root/a/b/c")); - assert_se(streq(path_join("/root", "a/b", "c"), "/root/a/b/c")); - assert_se(streq(path_join("/root", "/a/b", "c"), "/root/a/b/c")); - assert_se(streq(path_join("/root", "/", "c"), "/root//c")); - assert_se(streq(path_join("/root", "/", NULL), "/root/")); - - assert_se(streq(path_join(NULL, "/a/b", "/c"), "/a/b/c")); - assert_se(streq(path_join(NULL, "a/b", "c"), "a/b/c")); - assert_se(streq(path_join(NULL, "/a/b", "c"), "/a/b/c")); - assert_se(streq(path_join(NULL, "/", "c"), "//c")); - assert_se(streq(path_join(NULL, "/", NULL), "/")); + +#define test_join(root, path, rest, expected) { \ + _cleanup_free_ char *z = NULL; \ + z = path_join(root, path, rest); \ + assert_se(streq(z, expected)); \ + } + + test_join("/root", "/a/b", "/c", "/root/a/b/c"); + test_join("/root", "a/b", "c", "/root/a/b/c"); + test_join("/root", "/a/b", "c", "/root/a/b/c"); + test_join("/root", "/", "c", "/root//c"); + test_join("/root", "/", NULL, "/root/"); + + test_join(NULL, "/a/b", "/c", "/a/b/c"); + test_join(NULL, "a/b", "c", "a/b/c"); + test_join(NULL, "/a/b", "c", "/a/b/c"); + test_join(NULL, "/", "c", "//c"); + test_join(NULL, "/", NULL, "/"); } static void test_fsck_exists(void) { @@ -192,10 +199,10 @@ static void test_make_relative(void) { assert_se(path_make_relative("some/relative/path", "/some/path", &result) < 0); assert_se(path_make_relative("/some/path", "some/relative/path", &result) < 0); -#define test(from_dir, to_path, expected) { \ - path_make_relative(from_dir, to_path, &result); \ - assert_se(streq(result, expected)); \ - free(result); \ +#define test(from_dir, to_path, expected) { \ + _cleanup_free_ char *z = NULL; \ + path_make_relative(from_dir, to_path, &z); \ + assert_se(streq(z, expected)); \ } test("/", "/", "."); @@ -235,6 +242,25 @@ static void test_strv_resolve(void) { assert_se(rm_rf_dangerous(tmp_dir, false, true, false) == 0); } +static void test_path_startswith(void) { + assert_se(path_startswith("/foo/bar/barfoo/", "/foo")); + assert_se(path_startswith("/foo/bar/barfoo/", "/foo/")); + assert_se(path_startswith("/foo/bar/barfoo/", "/")); + assert_se(path_startswith("/foo/bar/barfoo/", "////")); + assert_se(path_startswith("/foo/bar/barfoo/", "/foo//bar/////barfoo///")); + assert_se(path_startswith("/foo/bar/barfoo/", "/foo/bar/barfoo////")); + assert_se(path_startswith("/foo/bar/barfoo/", "/foo/bar///barfoo/")); + assert_se(path_startswith("/foo/bar/barfoo/", "/foo////bar/barfoo/")); + assert_se(path_startswith("/foo/bar/barfoo/", "////foo/bar/barfoo/")); + assert_se(path_startswith("/foo/bar/barfoo/", "/foo/bar/barfoo")); + + assert_se(!path_startswith("/foo/bar/barfoo/", "/foo/bar/barfooa/")); + assert_se(!path_startswith("/foo/bar/barfoo/", "/foo/bar/barfooa")); + assert_se(!path_startswith("/foo/bar/barfoo/", "")); + assert_se(!path_startswith("/foo/bar/barfoo/", "/bar/foo")); + assert_se(!path_startswith("/foo/bar/barfoo/", "/f/b/b/")); +} + int main(int argc, char **argv) { test_path(); test_find_binary(argv[0]); @@ -243,5 +269,7 @@ int main(int argc, char **argv) { test_fsck_exists(); test_make_relative(); test_strv_resolve(); + test_path_startswith(); + return 0; }