X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftest%2Ftest-util.c;h=43bb0249a20e8833cca18d47ff24d9a1b8772d08;hp=7fd0572bcb1feb59e539c7d809cd9fe9ea6da30c;hb=2d5bdf5bc0e4714d42e5999a4e37553a6bf83575;hpb=510b857f7d1e7e8d38912890536342dd5dd647dd

diff --git a/src/test/test-util.c b/src/test/test-util.c
index 7fd0572bc..43bb0249a 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -28,6 +28,8 @@
 
 #include "util.h"
 #include "strv.h"
+#include "def.h"
+#include "fileio.h"
 
 static void test_streq_ptr(void) {
         assert_se(streq_ptr(NULL, NULL));
@@ -54,9 +56,9 @@ static void test_close_many(void) {
         char name1[] = "/tmp/test-close-many.XXXXXX";
         char name2[] = "/tmp/test-close-many.XXXXXX";
 
-        fds[0] = mkstemp(name0);
-        fds[1] = mkstemp(name1);
-        fds[2] = mkstemp(name2);
+        fds[0] = mkostemp_safe(name0, O_RDWR|O_CLOEXEC);
+        fds[1] = mkostemp_safe(name1, O_RDWR|O_CLOEXEC);
+        fds[2] = mkostemp_safe(name2, O_RDWR|O_CLOEXEC);
 
         close_many(fds, 2);
 
@@ -351,29 +353,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"));
@@ -591,6 +570,39 @@ static void test_get_files_in_directory(void) {
         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));
+}
+
+static void test_writev_safe(void) {
+        char name[] = "/tmp/test-writev_safe.XXXXXX";
+        _cleanup_free_ char *contents;
+        size_t size;
+        int fd, r;
+
+        struct iovec iov[3];
+        IOVEC_SET_STRING(iov[0], "abc\n");
+        IOVEC_SET_STRING(iov[1], ALPHANUMERICAL "\n");
+        IOVEC_SET_STRING(iov[2], "");
+
+        fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
+        printf("test_writev_safe: %s", name);
+
+        r = writev_safe(fd, iov, 3);
+        assert(r == 0);
+
+        r = read_full_file(name, &contents, &size);
+        assert(r == 0);
+        printf("contents: %s", contents);
+        assert(streq(contents, "abc\n" ALPHANUMERICAL "\n"));
+}
+
 int main(int argc, char *argv[]) {
         test_streq_ptr();
         test_first_word();
@@ -616,7 +628,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();
@@ -628,6 +639,8 @@ int main(int argc, char *argv[]) {
         test_split_pair();
         test_fstab_node_to_udev_node();
         test_get_files_in_directory();
+        test_in_set();
+        test_writev_safe();
 
         return 0;
 }