X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftest%2Ftest-strv.c;h=674c1b53fcf60f4ba64030080525099cfc3a1e1a;hp=7f475a6f4cb3f71b282e4fe08dcd7b48d9676a71;hb=98940a3cd93807b5a3809bb1fb7ab43d450939f1;hpb=04045d8426fa03fc4414d71b0454c47e951840d8 diff --git a/src/test/test-strv.c b/src/test/test-strv.c index 7f475a6f4..674c1b53f 100644 --- a/src/test/test-strv.c +++ b/src/test/test-strv.c @@ -27,63 +27,111 @@ #include "strv.h" static void test_specifier_printf(void) { - char *w; - - const Specifier table[] = { + static const Specifier table[] = { { 'a', specifier_string, (char*) "AAAA" }, { 'b', specifier_string, (char*) "BBBB" }, - { 0, NULL, NULL } + { 'm', specifier_machine_id, NULL }, + { 'B', specifier_boot_id, NULL }, + { 'H', specifier_host_name, NULL }, + { 'v', specifier_kernel_release, NULL }, + {} }; - w = specifier_printf("xxx a=%a b=%b yyy", table, NULL); - printf("<%s>\n", w); + _cleanup_free_ char *w = NULL; + int r; + + r = specifier_printf("xxx a=%a b=%b yyy", table, NULL, &w); + assert_se(r >= 0); + assert_se(w); + + puts(w); + assert_se(streq(w, "xxx a=AAAA b=BBBB yyy")); + free(w); + r = specifier_printf("machine=%m, boot=%B, host=%H, version=%v", table, NULL, &w); + assert_se(r >= 0); + assert_se(w); + puts(w); } -static void test_strv_find(void) { - const char * const input_table[] = { - "one", - "two", - "three", - NULL - }; +static const char* const input_table_multiple[] = { + "one", + "two", + "three", + NULL, +}; + +static const char* const input_table_one[] = { + "one", + NULL, +}; + +static const char* const input_table_none[] = { + NULL, +}; + +static const char* const input_table_quotes[] = { + "\"", + "'", + "\"\"", + "\\", + "\\\\", + NULL, +}; +#define QUOTES_STRING \ + "\"\\\"\" " \ + "\"\\\'\" " \ + "\"\\\"\\\"\" " \ + "\"\\\\\" " \ + "\"\\\\\\\\\"" + +static const char * const input_table_spaces[] = { + " ", + "' '", + "\" ", + " \"", + " \\\\ ", + NULL, +}; +#define SPACES_STRING \ + "\" \" " \ + "\"\\' \\'\" " \ + "\"\\\" \" " \ + "\" \\\"\" " \ + "\" \\\\\\\\ \"" - assert_se(strv_find((char **)input_table, "three")); - assert_se(!strv_find((char **)input_table, "four")); +static void test_strv_find(void) { + assert_se(strv_find((char **)input_table_multiple, "three")); + assert_se(!strv_find((char **)input_table_multiple, "four")); } static void test_strv_find_prefix(void) { - const char * const input_table[] = { - "one", - "two", - "three", - NULL - }; + assert_se(strv_find_prefix((char **)input_table_multiple, "o")); + assert_se(strv_find_prefix((char **)input_table_multiple, "one")); + assert_se(strv_find_prefix((char **)input_table_multiple, "")); + assert_se(!strv_find_prefix((char **)input_table_multiple, "xxx")); + assert_se(!strv_find_prefix((char **)input_table_multiple, "onee")); +} + +static void test_strv_find_startswith(void) { + char *r; - assert_se(strv_find_prefix((char **)input_table, "o")); - assert_se(strv_find_prefix((char **)input_table, "one")); - assert_se(strv_find_prefix((char **)input_table, "")); - assert_se(!strv_find_prefix((char **)input_table, "xxx")); - assert_se(!strv_find_prefix((char **)input_table, "onee")); + r = strv_find_startswith((char **)input_table_multiple, "o"); + assert_se(r && streq(r, "ne")); + + r = strv_find_startswith((char **)input_table_multiple, "one"); + assert_se(r && streq(r, "")); + + r = strv_find_startswith((char **)input_table_multiple, ""); + assert_se(r && streq(r, "one")); + + assert_se(!strv_find_startswith((char **)input_table_multiple, "xxx")); + assert_se(!strv_find_startswith((char **)input_table_multiple, "onee")); } static void test_strv_join(void) { _cleanup_free_ char *p = NULL, *q = NULL, *r = NULL, *s = NULL, *t = NULL; - const char * const input_table_multiple[] = { - "one", - "two", - "three", - NULL - }; - const char * const input_table_one[] = { - "one", - NULL - }; - const char * const input_table_none[] = { - NULL - }; - p = strv_join((char **)input_table_multiple, ", "); assert_se(p); assert_se(streq(p, "one, two, three")); @@ -105,6 +153,87 @@ static void test_strv_join(void) { assert_se(streq(t, "")); } +static void test_strv_quote_unquote(const char* const *split, const char *quoted) { + _cleanup_free_ char *p; + _cleanup_strv_free_ char **s; + char **t; + int r; + + p = strv_join_quoted((char **)split); + assert_se(p); + printf("-%s- --- -%s-\n", p, quoted); /* fprintf deals with NULL, puts does not */ + assert_se(p); + assert_se(streq(p, quoted)); + + r = strv_split_quoted(&s, quoted, false); + assert_se(r == 0); + assert_se(s); + STRV_FOREACH(t, s) { + assert_se(*t); + assert_se(streq(*t, *split)); + split++; + } +} + +static void test_strv_unquote(const char *quoted, const char **list) { + _cleanup_strv_free_ char **s; + _cleanup_free_ char *j; + unsigned i = 0; + char **t; + int r; + + r = strv_split_quoted(&s, quoted, false); + assert_se(r == 0); + assert_se(s); + j = strv_join(s, " | "); + assert_se(j); + puts(j); + + STRV_FOREACH(t, s) + assert_se(streq(list[i++], *t)); + + assert_se(list[i] == NULL); +} + +static void test_invalid_unquote(const char *quoted) { + char **s = NULL; + int r; + + r = strv_split_quoted(&s, quoted, false); + assert_se(s == NULL); + assert_se(r == -EINVAL); +} + +static void test_strv_split(void) { + char **s; + unsigned i = 0; + _cleanup_strv_free_ char **l = NULL; + const char str[] = "one,two,three"; + + l = strv_split(str, ","); + + assert_se(l); + + STRV_FOREACH(s, l) { + assert_se(streq(*s, input_table_multiple[i++])); + } +} + +static void test_strv_split_newlines(void) { + unsigned i = 0; + char **s; + _cleanup_strv_free_ char **l = NULL; + const char str[] = "one\ntwo\nthree"; + + l = strv_split_newlines(str); + + assert_se(l); + + STRV_FOREACH(s, l) { + assert_se(streq(*s, input_table_multiple[i++])); + } +} + static void test_strv_split_nulstr(void) { _cleanup_strv_free_ char **l = NULL; const char nulstr[] = "str0\0str1\0str2\0str3\0"; @@ -159,7 +288,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", @@ -177,72 +306,219 @@ static void test_strv_sort(void) { assert_se(streq(input_table[4], "durian")); } -static void test_strv_merge_concat(void) { - _cleanup_strv_free_ char **a = NULL, **b = NULL, **c = NULL; +static void test_strv_extend_strv_concat(void) { + _cleanup_strv_free_ char **a = NULL, **b = NULL; 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(strv_extend_strv_concat(&a, b, "_suffix") >= 0); - assert_se(streq(c[0], "without")); - assert_se(streq(c[1], "suffix")); - assert_se(streq(c[2], "with_suffix")); - assert_se(streq(c[3], "suffix_suffix")); + assert_se(streq(a[0], "without")); + assert_se(streq(a[1], "suffix")); + assert_se(streq(a[2], "with_suffix")); + assert_se(streq(a[3], "suffix_suffix")); } -static void test_strv_merge(void) { - _cleanup_strv_free_ char **a = NULL, **b = NULL, **c = NULL; +static void test_strv_extend_strv(void) { + _cleanup_strv_free_ char **a = NULL, **b = NULL; 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(strv_extend_strv(&a, b) >= 0); - assert_se(streq(c[0], "abc")); - assert_se(streq(c[1], "def")); - assert_se(streq(c[2], "ghi")); - assert_se(streq(c[3], "jkl")); - assert_se(streq(c[4], "mno")); - assert_se(streq(c[5], "pqr")); + assert_se(streq(a[0], "abc")); + assert_se(streq(a[1], "def")); + assert_se(streq(a[2], "ghi")); + assert_se(streq(a[3], "jkl")); + assert_se(streq(a[4], "mno")); + assert_se(streq(a[5], "pqr")); - assert_se(strv_length(c) == 6); + assert_se(strv_length(a) == 6); } -static void test_strv_append(void) { - _cleanup_strv_free_ char **a = NULL, **b = NULL, **c = NULL; +static void test_strv_extend(void) { + _cleanup_strv_free_ char **a = NULL, **b = 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(strv_extend(&a, "test2") >= 0); + assert_se(strv_extend(&b, "test3") >= 0); + + assert_se(streq(a[0], "test")); + assert_se(streq(a[1], "test1")); + assert_se(streq(a[2], "test2")); + assert_se(streq(b[0], "test3")); +} + +static void test_strv_extendf(void) { + _cleanup_strv_free_ char **a = NULL, **b = NULL; + + a = strv_new("test", "test1", NULL); + assert_se(a); + assert_se(strv_extendf(&a, "test2 %s %d %s", "foo", 128, "bar") >= 0); + assert_se(strv_extendf(&b, "test3 %s %s %d", "bar", "foo", 128) >= 0); + + assert_se(streq(a[0], "test")); + assert_se(streq(a[1], "test1")); + assert_se(streq(a[2], "test2 foo 128 bar")); + assert_se(streq(b[0], "test3 bar foo 128")); +} + +static void test_strv_foreach(void) { + _cleanup_strv_free_ char **a; + unsigned i = 0; + char **check; + + a = strv_new("one", "two", "three", NULL); + + assert_se(a); - assert_se(streq(b[0], "test")); - assert_se(streq(b[1], "test1")); - assert_se(streq(b[2], "test2")); - assert_se(streq(c[0], "test3")); + STRV_FOREACH(check, a) { + assert_se(streq(*check, input_table_multiple[i++])); + } +} + +static void test_strv_foreach_backwards(void) { + _cleanup_strv_free_ char **a; + unsigned i = 2; + char **check; + + a = strv_new("one", "two", "three", NULL); + + assert_se(a); + + STRV_FOREACH_BACKWARDS(check, a) { + assert_se(streq_ptr(*check, input_table_multiple[i--])); + } +} + +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)); + } +} + +static void test_strv_from_stdarg_alloca_one(char **l, const char *first, ...) { + char **j; + unsigned i; + + j = strv_from_stdarg_alloca(first); + + for (i = 0;; i++) { + assert_se(streq_ptr(l[i], j[i])); + + if (!l[i]) + break; + } +} + +static void test_strv_from_stdarg_alloca(void) { + test_strv_from_stdarg_alloca_one(STRV_MAKE("foo", "bar"), "foo", "bar", NULL); + test_strv_from_stdarg_alloca_one(STRV_MAKE("foo"), "foo", NULL); + test_strv_from_stdarg_alloca_one(STRV_MAKE_EMPTY, NULL); +} + +static void test_strv_push_prepend(void) { + _cleanup_strv_free_ char **a = NULL; + + a = strv_new("foo", "bar", "three", NULL); + + assert_se(strv_push_prepend(&a, strdup("first")) >= 0); + assert_se(streq(a[0], "first")); + assert_se(streq(a[1], "foo")); + assert_se(streq(a[2], "bar")); + assert_se(streq(a[3], "three")); + assert_se(!a[4]); + + assert_se(strv_consume_prepend(&a, strdup("first2")) >= 0); + assert_se(streq(a[0], "first2")); + assert_se(streq(a[1], "first")); + assert_se(streq(a[2], "foo")); + assert_se(streq(a[3], "bar")); + assert_se(streq(a[4], "three")); + assert_se(!a[5]); +} + +static void test_strv_push(void) { + _cleanup_strv_free_ char **a = NULL; + char *i, *j; + + assert_se(i = strdup("foo")); + assert_se(strv_push(&a, i) >= 0); + + assert_se(i = strdup("a")); + assert_se(j = strdup("b")); + assert_se(strv_push_pair(&a, i, j) >= 0); + + assert_se(streq_ptr(a[0], "foo")); + assert_se(streq_ptr(a[1], "a")); + assert_se(streq_ptr(a[2], "b")); + assert_se(streq_ptr(a[3], NULL)); } int main(int argc, char *argv[]) { test_specifier_printf(); + test_strv_foreach(); + test_strv_foreach_backwards(); + test_strv_foreach_pair(); test_strv_find(); test_strv_find_prefix(); + test_strv_find_startswith(); test_strv_join(); + + test_strv_quote_unquote(input_table_multiple, "\"one\" \"two\" \"three\""); + test_strv_quote_unquote(input_table_one, "\"one\""); + test_strv_quote_unquote(input_table_none, ""); + test_strv_quote_unquote(input_table_quotes, QUOTES_STRING); + test_strv_quote_unquote(input_table_spaces, SPACES_STRING); + + test_strv_unquote(" foo=bar \"waldo\" zzz ", (const char*[]) { "foo=bar", "waldo", "zzz", NULL }); + test_strv_unquote("", (const char*[]) { NULL }); + test_strv_unquote(" ", (const char*[]) { NULL }); + test_strv_unquote(" ", (const char*[]) { NULL }); + test_strv_unquote(" x", (const char*[]) { "x", NULL }); + test_strv_unquote("x ", (const char*[]) { "x", NULL }); + test_strv_unquote(" x ", (const char*[]) { "x", NULL }); + test_strv_unquote(" \"x\" ", (const char*[]) { "x", NULL }); + test_strv_unquote(" 'x' ", (const char*[]) { "x", NULL }); + test_strv_unquote(" 'x\"' ", (const char*[]) { "x\"", NULL }); + test_strv_unquote(" \"x'\" ", (const char*[]) { "x'", NULL }); + test_strv_unquote("a '--b=c \"d e\"'", (const char*[]) { "a", "--b=c \"d e\"", NULL }); + + test_invalid_unquote("a --b='c \"d e\"''"); + test_invalid_unquote("a --b='c \"d e\" '\""); + test_invalid_unquote("a --b='c \"d e\"garbage"); + test_invalid_unquote("'"); + test_invalid_unquote("\""); + test_invalid_unquote("'x'y'g"); + + test_strv_split(); + test_strv_split_newlines(); test_strv_split_nulstr(); test_strv_parse_nulstr(); test_strv_overlap(); test_strv_sort(); - test_strv_merge(); - test_strv_merge_concat(); - test_strv_append(); + test_strv_extend_strv(); + test_strv_extend_strv_concat(); + test_strv_extend(); + test_strv_extendf(); + test_strv_from_stdarg_alloca(); + test_strv_push_prepend(); + test_strv_push(); return 0; }