X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-strv.c;h=074e1bb3d411c399a5401b2dd7d260ab9f2891fe;hb=a0ab566574303be1ca12cdb334f284cfd407caa5;hp=a8801b56b5f0d5c9096aff03d7dea33f1c001ba5;hpb=7b68d618a2946ccd022dc424147adddebafb8298;p=elogind.git

diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index a8801b56b..074e1bb3d 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -27,7 +27,7 @@
 #include "strv.h"
 
 static void test_specifier_printf(void) {
-        char *w;
+        _cleanup_free_ char *w = NULL;
 
         const Specifier table[] = {
                 { 'a', specifier_string, (char*) "AAAA" },
@@ -36,8 +36,10 @@ static void test_specifier_printf(void) {
         };
 
         w = specifier_printf("xxx a=%a b=%b yyy", table, NULL);
-        printf("<%s>\n", w);
-        free(w);
+        puts(w);
+
+        assert_se(w);
+        assert_se(streq(w, "xxx a=AAAA b=BBBB yyy"));
 }
 
 static void test_strv_find(void) {
@@ -85,26 +87,45 @@ static void test_strv_join(void) {
         };
 
         p = strv_join((char **)input_table_multiple, ", ");
+        assert_se(p);
         assert_se(streq(p, "one, two, three"));
 
         q = strv_join((char **)input_table_multiple, ";");
+        assert_se(q);
         assert_se(streq(q, "one;two;three"));
 
         r = strv_join((char **)input_table_multiple, NULL);
+        assert_se(r);
         assert_se(streq(r, "one two three"));
 
         s = strv_join((char **)input_table_one, ", ");
+        assert_se(s);
         assert_se(streq(s, "one"));
 
         t = strv_join((char **)input_table_none, ", ");
+        assert_se(t);
         assert_se(streq(t, ""));
 }
 
+static void test_strv_split_nulstr(void) {
+        _cleanup_strv_free_ char **l = NULL;
+        const char nulstr[] = "str0\0str1\0str2\0str3\0";
+
+        l = strv_split_nulstr (nulstr);
+        assert_se(l);
+
+        assert_se(streq(l[0], "str0"));
+        assert_se(streq(l[1], "str1"));
+        assert_se(streq(l[2], "str2"));
+        assert_se(streq(l[3], "str3"));
+}
+
 static void test_strv_parse_nulstr(void) {
         _cleanup_strv_free_ char **l = NULL;
         const char nulstr[] = "fuck\0fuck2\0fuck3\0\0fuck5\0\0xxx";
 
         l = strv_parse_nulstr(nulstr, sizeof(nulstr)-1);
+        assert_se(l);
         puts("Parse nulstr:");
         strv_print(l);
 
@@ -140,7 +161,7 @@ static void test_strv_overlap(void) {
 }
 
 static void test_strv_sort(void) {
-        const char * const input_table[] = {
+        const char* input_table[] = {
                 "durian",
                 "apple",
                 "citrus",
@@ -163,8 +184,11 @@ static void test_strv_merge_concat(void) {
 
         a = strv_new("without", "suffix", NULL);
         b = strv_new("with", "suffix", NULL);
+        assert_se(a);
+        assert_se(b);
 
         c = strv_merge_concat(a, b, "_suffix");
+        assert_se(c);
 
         assert_se(streq(c[0], "without"));
         assert_se(streq(c[1], "suffix"));
@@ -177,8 +201,11 @@ static void test_strv_merge(void) {
 
         a = strv_new("abc", "def", "ghi", NULL);
         b = strv_new("jkl", "mno", "pqr", NULL);
+        assert_se(a);
+        assert_se(b);
 
         c = strv_merge(a, b);
+        assert_se(c);
 
         assert_se(streq(c[0], "abc"));
         assert_se(streq(c[1], "def"));
@@ -194,8 +221,11 @@ static void test_strv_append(void) {
         _cleanup_strv_free_ char **a = NULL, **b = NULL, **c = NULL;
 
         a = strv_new("test", "test1", NULL);
+        assert_se(a);
         b = strv_append(a, "test2");
         c = strv_append(NULL, "test3");
+        assert_se(b);
+        assert_se(c);
 
         assert_se(streq(b[0], "test"));
         assert_se(streq(b[1], "test1"));
@@ -203,11 +233,27 @@ static void test_strv_append(void) {
         assert_se(streq(c[0], "test3"));
 }
 
+static void test_strv_foreach_pair(void) {
+        _cleanup_strv_free_ char **a = NULL;
+        char **x, **y;
+
+        a = strv_new("pair_one",   "pair_one",
+                     "pair_two",   "pair_two",
+                     "pair_three", "pair_three",
+                     NULL);
+
+        STRV_FOREACH_PAIR(x, y, a) {
+                assert_se(streq(*x, *y));
+        }
+}
+
 int main(int argc, char *argv[]) {
         test_specifier_printf();
+        test_strv_foreach_pair();
         test_strv_find();
         test_strv_find_prefix();
         test_strv_join();
+        test_strv_split_nulstr();
         test_strv_parse_nulstr();
         test_strv_overlap();
         test_strv_sort();