[systemd-devel] [PATCH] tests: add tests for strv.c

[Tom Gundersen]

Applied. Thanks!

Tom

On Thu, Oct 30, 2014 at 10:34 PM, Ronny Chevalier
<chevalier.ronny at gmail.com> wrote:
> add tests for:
> - strv_find_startswith
> - strv_push_prepend
> - strv_consume_prepend
> ---
>  src/test/test-strv.c | 39 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 39 insertions(+)
>
> diff --git a/src/test/test-strv.c b/src/test/test-strv.c
> index bbfe306..915fa46 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;
>
> @@ -416,6 +432,27 @@ 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]);
> +}
> +
>  int main(int argc, char *argv[]) {
>          test_specifier_printf();
>          test_strv_foreach();
> @@ -423,6 +460,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\"");
> @@ -462,6 +500,7 @@ int main(int argc, char *argv[]) {
>          test_strv_extend();
>          test_strv_extendf();
>          test_strv_from_stdarg_alloca();
> +        test_strv_push_prepend();
>
>          return 0;
>  }
> --
> 2.1.3
>
> _______________________________________________
> systemd-devel mailing list
> systemd-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel