X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-strv.c;h=068e4210979d50e828b34bdeb25908f619e528c8;hb=e3dd987cfc395848256fc6eae637ed0eaf5f1635;hp=6513d2e07b01b5bd86164d04d076b8528b99f2a2;hpb=19f6d710772305610b928bc2678b9d77fe11e770;p=elogind.git diff --git a/src/test/test-strv.c b/src/test/test-strv.c index 6513d2e07..068e42109 100644 --- a/src/test/test-strv.c +++ b/src/test/test-strv.c @@ -27,19 +27,19 @@ #include "strv.h" static void test_specifier_printf(void) { - _cleanup_free_ char *w = NULL; - int r; - - const Specifier table[] = { + static const Specifier table[] = { { 'a', specifier_string, (char*) "AAAA" }, { 'b', specifier_string, (char*) "BBBB" }, { 'm', specifier_machine_id, NULL }, { 'B', specifier_boot_id, NULL }, { 'H', specifier_host_name, NULL }, { 'v', specifier_kernel_release, NULL }, - { 0, NULL, NULL } + {} }; + _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); @@ -143,6 +143,7 @@ static void test_strv_quote_unquote(const char* const *split, const char *quoted char **t; 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)); @@ -156,6 +157,50 @@ static void test_strv_quote_unquote(const char* const *split, const char *quoted } } +static void test_strv_quote_unquote2(const char *quoted, const char ** list) { + _cleanup_strv_free_ char **s; + unsigned i = 0; + char **t; + + s = strv_split_quoted(quoted); + assert_se(s); + + STRV_FOREACH(t, s) + assert_se(streq(list[i++], *t)); + + assert_se(list[i] == NULL); +} + +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(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(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"; @@ -169,6 +214,22 @@ static void test_strv_split_nulstr(void) { assert_se(streq(l[3], "str3")); } +static void test_strv_remove_prefix(void) { + unsigned i = 0; + char **s; + _cleanup_strv_free_ char **l = NULL; + + l = strv_new("_one", "_two", "_three", NULL); + assert(l); + + l = strv_remove_prefix(l, "_"); + assert(l); + + STRV_FOREACH(s, l) { + assert_se(streq(*s, input_table_multiple[i++])); + } +} + static void test_strv_parse_nulstr(void) { _cleanup_strv_free_ char **l = NULL; const char nulstr[] = "fuck\0fuck2\0fuck3\0\0fuck5\0\0xxx"; @@ -282,6 +343,34 @@ static void test_strv_append(void) { assert_se(streq(c[0], "test3")); } +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); + + 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(*check, input_table_multiple[i--])); + } +} + static void test_strv_foreach_pair(void) { _cleanup_strv_free_ char **a = NULL; char **x, **y; @@ -296,8 +385,30 @@ static void test_strv_foreach_pair(void) { } } +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); +} + 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(); @@ -309,13 +420,29 @@ int main(int argc, char *argv[]) { test_strv_quote_unquote(input_table_quotes, QUOTES_STRING); test_strv_quote_unquote(input_table_spaces, SPACES_STRING); + test_strv_quote_unquote2(" foo=bar \"waldo\" zzz ", (const char*[]) { "foo=bar", "waldo", "zzz", NULL }); + test_strv_quote_unquote2("", (const char*[]) { NULL }); + test_strv_quote_unquote2(" ", (const char*[]) { NULL }); + test_strv_quote_unquote2(" ", (const char*[]) { NULL }); + test_strv_quote_unquote2(" x", (const char*[]) { "x", NULL }); + test_strv_quote_unquote2("x ", (const char*[]) { "x", NULL }); + test_strv_quote_unquote2(" x ", (const char*[]) { "x", NULL }); + test_strv_quote_unquote2(" \"x\" ", (const char*[]) { "x", NULL }); + test_strv_quote_unquote2(" \'x\' ", (const char*[]) { "x", NULL }); + test_strv_quote_unquote2(" \'x\"\' ", (const char*[]) { "x\"", NULL }); + test_strv_quote_unquote2(" \"x\'\" ", (const char*[]) { "x\'", NULL }); + + test_strv_split(); + test_strv_split_newlines(); test_strv_split_nulstr(); test_strv_parse_nulstr(); + test_strv_remove_prefix(); test_strv_overlap(); test_strv_sort(); test_strv_merge(); test_strv_merge_concat(); test_strv_append(); + test_strv_from_stdarg_alloca(); return 0; }