X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-strv.c;h=5ae929c3f8f9bb50b2d5e33eccca0995adc4ac47;hb=adfe5671ef794099068038dfccbf1eb5134433c8;hp=24ed681482ec240c8eb0a9c9c687a92853ee49bc;hpb=4a336a69fdfbe48d18b65c3e20ca6a007be253c5;p=elogind.git diff --git a/src/test/test-strv.c b/src/test/test-strv.c index 24ed68148..5ae929c3f 100644 --- a/src/test/test-strv.c +++ b/src/test/test-strv.c @@ -113,6 +113,22 @@ static void test_strv_find_prefix(void) { assert_se(!strv_find_prefix((char **)input_table_multiple, "onee")); } +static void test_strv_find_startswith(void) { + char *r; + + 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; @@ -141,6 +157,7 @@ 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); @@ -148,7 +165,8 @@ static void test_strv_quote_unquote(const char* const *split, const char *quoted assert_se(p); assert_se(streq(p, quoted)); - s = strv_split_quoted(quoted); + r = strv_split_quoted(&s, quoted, false); + assert_se(r == 0); assert_se(s); STRV_FOREACH(t, s) { assert_se(*t); @@ -157,13 +175,19 @@ 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) { +static void test_strv_unquote(const char *quoted, char **list) { _cleanup_strv_free_ char **s; + _cleanup_free_ char *j; unsigned i = 0; char **t; + int r; - s = strv_split_quoted(quoted); + 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)); @@ -171,6 +195,15 @@ static void test_strv_quote_unquote2(const char *quoted, const char ** list) { 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; @@ -179,7 +212,7 @@ static void test_strv_split(void) { l = strv_split(str, ","); - assert(l); + assert_se(l); STRV_FOREACH(s, l) { assert_se(streq(*s, input_table_multiple[i++])); @@ -194,7 +227,7 @@ static void test_strv_split_newlines(void) { l = strv_split_newlines(str); - assert(l); + assert_se(l); STRV_FOREACH(s, l) { assert_se(streq(*s, input_table_multiple[i++])); @@ -399,6 +432,116 @@ static void test_strv_from_stdarg_alloca(void) { 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)); +} + +static void test_strv_equal(void) { + _cleanup_strv_free_ char **a = NULL; + _cleanup_strv_free_ char **b = NULL; + _cleanup_strv_free_ char **c = NULL; + + a = strv_new("one", "two", "three", NULL); + assert_se(a); + b = strv_new("one", "two", "three", NULL); + assert_se(a); + c = strv_new("one", "two", "three", "four", NULL); + assert_se(a); + + assert_se(strv_equal(a, a)); + assert_se(strv_equal(a, b)); + assert_se(strv_equal(NULL, NULL)); + + assert_se(!strv_equal(a, c)); + assert_se(!strv_equal(b, c)); + assert_se(!strv_equal(b, NULL)); +} + +static void test_strv_is_uniq(void) { + _cleanup_strv_free_ char **a = NULL, **b = NULL, **c = NULL, **d = NULL; + + a = strv_new(NULL, NULL); + assert_se(a); + assert_se(strv_is_uniq(a)); + + b = strv_new("foo", NULL); + assert_se(b); + assert_se(strv_is_uniq(b)); + + c = strv_new("foo", "bar", NULL); + assert_se(c); + assert_se(strv_is_uniq(c)); + + d = strv_new("foo", "bar", "waldo", "bar", "piep", NULL); + assert_se(d); + assert_se(!strv_is_uniq(d)); +} + +static void test_strv_reverse(void) { + _cleanup_strv_free_ char **a = NULL, **b = NULL, **c = NULL, **d = NULL; + + a = strv_new(NULL, NULL); + assert_se(a); + + strv_reverse(a); + assert_se(strv_isempty(a)); + + b = strv_new("foo", NULL); + assert_se(b); + strv_reverse(b); + assert_se(streq_ptr(b[0], "foo")); + assert_se(streq_ptr(b[1], NULL)); + + c = strv_new("foo", "bar", NULL); + assert_se(c); + strv_reverse(c); + assert_se(streq_ptr(c[0], "bar")); + assert_se(streq_ptr(c[1], "foo")); + assert_se(streq_ptr(c[2], NULL)); + + d = strv_new("foo", "bar", "waldo", NULL); + assert_se(d); + strv_reverse(d); + assert_se(streq_ptr(d[0], "waldo")); + assert_se(streq_ptr(d[1], "bar")); + assert_se(streq_ptr(d[2], "foo")); + assert_se(streq_ptr(d[3], NULL)); +} + int main(int argc, char *argv[]) { test_specifier_printf(); test_strv_foreach(); @@ -406,6 +549,7 @@ int main(int argc, char *argv[]) { 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\""); @@ -414,17 +558,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_unquote(" foo=bar \"waldo\" zzz ", STRV_MAKE("foo=bar", "waldo", "zzz")); + test_strv_unquote("", STRV_MAKE_EMPTY); + test_strv_unquote(" ", STRV_MAKE_EMPTY); + test_strv_unquote(" ", STRV_MAKE_EMPTY); + test_strv_unquote(" x", STRV_MAKE("x")); + test_strv_unquote("x ", STRV_MAKE("x")); + test_strv_unquote(" x ", STRV_MAKE("x")); + test_strv_unquote(" \"x\" ", STRV_MAKE("x")); + test_strv_unquote(" 'x' ", STRV_MAKE("x")); + test_strv_unquote(" 'x\"' ", STRV_MAKE("x\"")); + test_strv_unquote(" \"x'\" ", STRV_MAKE("x'")); + test_strv_unquote("a '--b=c \"d e\"'", STRV_MAKE("a", "--b=c \"d e\"")); + + /* trailing backslashes */ + test_strv_unquote(" x\\\\", STRV_MAKE("x\\")); + test_invalid_unquote(" x\\"); + + 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(); @@ -437,6 +593,11 @@ int main(int argc, char *argv[]) { test_strv_extend(); test_strv_extendf(); test_strv_from_stdarg_alloca(); + test_strv_push_prepend(); + test_strv_push(); + test_strv_equal(); + test_strv_is_uniq(); + test_strv_reverse(); return 0; }