[Spice-devel] [PATCH spice v2 1/2] Add test for codecs parsing

[Christophe Fergeau]

On Wed, Nov 16, 2016 at 10:10:00AM +0100, Pavel Grunt wrote:
> With Glib2.34 test invalid codec strings
> ---
>  server/tests/Makefile.am                 |   1 +
>  server/tests/spice-codecs-parsing-test.c | 104 +++++++++++++++++++++++++++++++
>  2 files changed, 105 insertions(+)
>  create mode 100644 server/tests/spice-codecs-parsing-test.c
> 
> diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
> index 8580a9a..37b9f88 100644
> --- a/server/tests/Makefile.am
> +++ b/server/tests/Makefile.am
> @@ -37,6 +37,7 @@ LDADD =								\
>  	$(NULL)
>  
>  check_PROGRAMS =				\
> +	spice-codecs-parsing-test		\
>  	spice-options-test			\
>  	stat_test				\
>  	stream-test				\
> diff --git a/server/tests/spice-codecs-parsing-test.c b/server/tests/spice-codecs-parsing-test.c
> new file mode 100644
> index 0000000..b679686
> --- /dev/null
> +++ b/server/tests/spice-codecs-parsing-test.c
> @@ -0,0 +1,104 @@
> +/* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */
> +/*
> +   Copyright (C) 2016 Red Hat, Inc.
> +
> +   This library is free software; you can redistribute it and/or
> +   modify it under the terms of the GNU Lesser General Public
> +   License as published by the Free Software Foundation; either
> +   version 2.1 of the License, or (at your option) any later version.
> +
> +   This library is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +   Lesser General Public License for more details.
> +
> +   You should have received a copy of the GNU Lesser General Public
> +   License along with this library; if not, see <http://www.gnu.org/licenses/>.
> +*/
> +#include <config.h>
> +#include <glib.h>
> +#include <spice.h>
> +
> +/* GLIB_CHECK_VERSION(2, 40, 0) */
> +#ifndef g_assert_nonnull
> +#define g_assert_nonnull g_assert
> +#endif
> +
> +static void codecs_good(void)
> +{
> +    guint i;
> +    const gchar *codecs[] = {
> +        "",
> +        "spice:mjpeg",
> +        "spice:mjpeg;;;",
> +        "spice:mjpeg;;spice:mjpeg;;;",
> +        ";;spice:mjpeg;;spice:mjpeg;;;",
> +#if defined(HAVE_GSTREAMER_1_0) || defined(HAVE_GSTREAMER_0_10)
> +        "gstreamer:mjpeg;gstreamer:h264;gstreamer:vp8;",
> +        ";;spice:mjpeg;;gstreamer:mjpeg;gstreamer:h264;gstreamer:vp8;",
> +#endif
> +    };
> +
> +    SpiceServer *server = spice_server_new();
> +
> +    g_assert_nonnull(server);
> +
> +    for (i = 0; i < G_N_ELEMENTS(codecs); ++i) {
> +        g_assert_cmpint(spice_server_set_video_codecs(server, codecs[i]), ==, 0);
> +    }
> +
> +    spice_server_destroy(server);
> +}
> +
> +/* g_test_expect_message is available since Glib 2.34 */
> +#if GLIB_CHECK_VERSION(2, 34, 0)
> +static void codecs_bad(void)
> +{
> +    guint i;
> +    const struct {
> +        const gchar *codecs;
> +        const gchar *error_message;
> +    } test_cases[] = {
> +        {
> +            "missingcolon",
> +            "*spice: invalid encoder:codec value*",
> +        },{
> +            "unknown_encoder:mjpeg",
> +            "*spice: unknown video encoder unknown_encoder",
> +        },{
> +            "spice:unknown_codec",
> +            "*spice: unknown video codec unknown_codec",
> +        },
> +#if !defined(HAVE_GSTREAMER_1_0) && !defined(HAVE_GSTREAMER_0_10)
> +        {
> +            "gstreamer:mjpeg",
> +            "*spice: unsupported video encoder gstreamer",
> +        }
> +#endif

I'd add variations like "foo:" ":foo" ":" ":;" ";" and this kind of
things.

> +    };
> +
> +    SpiceServer *server = spice_server_new();
> +
> +    g_assert_nonnull(server);
> +
> +    for (i = 0; i < G_N_ELEMENTS(test_cases); ++i) {
> +        g_test_expect_message("Spice", G_LOG_LEVEL_WARNING, test_cases[i].error_message);
> +        g_assert_cmpint(spice_server_set_video_codecs(server, test_cases[i].codecs), ==, 0);
> +        g_test_assert_expected_messages();
> +    }
> +
> +    spice_server_destroy(server);
> +}
> +#endif
> +
> +int main(int argc, char *argv[])
> +{
> +    g_test_init(&argc, &argv, NULL);
> +
> +    g_test_add_func("/server/codecs good", codecs_good);
> +#if GLIB_CHECK_VERSION(2, 34, 0)
> +    g_test_add_func("/server/codecs bad", codecs_bad);
> +#endif

I usually don't put spaces in test names, ie "/server/codecs-good", no
idea if it's common practice or not.


Acked-by: Christophe Fergeau <cfergeau at redhat.com>
thanks a lot for adding tests :)

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20161116/b7b49cde/attachment.sig>