X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-util.c;h=05b2294e24cba588e3580e13f8c6af4564a9b473;hb=171754aa4ae37a6ab626878256f7b664da78ef55;hp=dd7768d36c5652720fb64c9590683c7411628da0;hpb=143bfdaf0b890fa7acadf02d1eafacaef1b696bd;p=elogind.git

diff --git a/src/test/test-util.c b/src/test/test-util.c
index dd7768d36..05b2294e2 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -27,6 +27,7 @@
 #include <errno.h>
 
 #include "util.h"
+#include "strv.h"
 
 static void test_streq_ptr(void) {
         assert_se(streq_ptr(NULL, NULL));
@@ -350,29 +351,6 @@ static void test_memdup_multiply(void) {
         free(dup);
 }
 
-static void test_bus_path_escape_one(const char *a, const char *b) {
-        _cleanup_free_ char *t = NULL, *x = NULL, *y = NULL;
-
-        assert_se(t = bus_path_escape(a));
-        assert_se(streq(t, b));
-
-        assert_se(x = bus_path_unescape(t));
-        assert_se(streq(a, x));
-
-        assert_se(y = bus_path_unescape(b));
-        assert_se(streq(a, y));
-}
-
-static void test_bus_path_escape(void) {
-        test_bus_path_escape_one("foo123bar", "foo123bar");
-        test_bus_path_escape_one("foo.bar", "foo_2ebar");
-        test_bus_path_escape_one("foo_2ebar", "foo_5f2ebar");
-        test_bus_path_escape_one("", "_");
-        test_bus_path_escape_one("_", "_5f");
-        test_bus_path_escape_one("1", "_31");
-        test_bus_path_escape_one(":1", "_3a1");
-}
-
 static void test_hostname_is_valid(void) {
         assert(hostname_is_valid("foobar"));
         assert(hostname_is_valid("foobar.com"));
@@ -547,6 +525,59 @@ static void test_split_pair(void) {
         assert_se(streq(b, "="));
 }
 
+static void test_fstab_node_to_udev_node(void) {
+        char *n;
+
+        n = fstab_node_to_udev_node("LABEL=applé/jack");
+        puts(n);
+        assert_se(streq(n, "/dev/disk/by-label/applé\\x2fjack"));
+        free(n);
+
+        n = fstab_node_to_udev_node("PARTLABEL=pinkié pie");
+        puts(n);
+        assert_se(streq(n, "/dev/disk/by-partlabel/pinkié\\x20pie"));
+        free(n);
+
+        n = fstab_node_to_udev_node("UUID=037b9d94-148e-4ee4-8d38-67bfe15bb535");
+        puts(n);
+        assert_se(streq(n, "/dev/disk/by-uuid/037b9d94-148e-4ee4-8d38-67bfe15bb535"));
+        free(n);
+
+        n = fstab_node_to_udev_node("PARTUUID=037b9d94-148e-4ee4-8d38-67bfe15bb535");
+        puts(n);
+        assert_se(streq(n, "/dev/disk/by-partuuid/037b9d94-148e-4ee4-8d38-67bfe15bb535"));
+        free(n);
+
+
+        n = fstab_node_to_udev_node("PONIES=awesome");
+        puts(n);
+        assert_se(streq(n, "PONIES=awesome"));
+        free(n);
+
+        n = fstab_node_to_udev_node("/dev/xda1");
+        puts(n);
+        assert_se(streq(n, "/dev/xda1"));
+        free(n);
+}
+
+static void test_get_files_in_directory(void) {
+        _cleanup_strv_free_ char **l = NULL, **t = NULL;
+
+        assert_se(get_files_in_directory("/tmp", &l) >= 0);
+        assert_se(get_files_in_directory(".", &t) >= 0);
+        assert_se(get_files_in_directory(".", NULL) >= 0);
+}
+
+static void test_in_set(void) {
+        assert_se(IN_SET(1, 1));
+        assert_se(IN_SET(1, 1, 2, 3, 4));
+        assert_se(IN_SET(2, 1, 2, 3, 4));
+        assert_se(IN_SET(3, 1, 2, 3, 4));
+        assert_se(IN_SET(4, 1, 2, 3, 4));
+        assert_se(!IN_SET(0, 1));
+        assert_se(!IN_SET(0, 1, 2, 3, 4));
+}
+
 int main(int argc, char *argv[]) {
         test_streq_ptr();
         test_first_word();
@@ -572,7 +603,6 @@ int main(int argc, char *argv[]) {
         test_foreach_word_quoted();
         test_default_term_for_tty();
         test_memdup_multiply();
-        test_bus_path_escape();
         test_hostname_is_valid();
         test_u64log2();
         test_get_process_comm();
@@ -582,6 +612,9 @@ int main(int argc, char *argv[]) {
         test_strrep();
         test_parse_user_at_host();
         test_split_pair();
+        test_fstab_node_to_udev_node();
+        test_get_files_in_directory();
+        test_in_set();
 
         return 0;
 }