[Spice-devel] [PATCH spice-server] tests: Use g_assert_(non)null instead of g_assert

[Uri Lublin]

On 12/3/18 7:09 PM, Frediano Ziglio wrote:
> Just a style change, on more recent GLib would print a more
> friendly error report.
> 
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>

Ack.

Documentation mentions these macros should only be used in
tests and the patch indeed only touches tests.

https://developer.gnome.org/glib/unstable/glib-Testing.html#g-assert-nonnull

Uri.

> ---
>   server/tests/test-display-base.c | 2 +-
>   server/tests/test-listen.c       | 6 ++++--
>   2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/server/tests/test-display-base.c b/server/tests/test-display-base.c
> index e9f6c54d..3ca85f3a 100644
> --- a/server/tests/test-display-base.c
> +++ b/server/tests/test-display-base.c
> @@ -943,7 +943,7 @@ Test* test_new(SpiceCoreInterface* core)
>           spice_server_destroy(server);
>       }
>   
> -    g_assert(test->server != NULL);
> +    g_assert_nonnull(test->server);
>   
>       printf("TESTER: listening on port %d (unsecure)\n", port);
>       g_test_log_set_fatal_handler(NULL, NULL);
> diff --git a/server/tests/test-listen.c b/server/tests/test-listen.c
> index d355b471..640e8f12 100644
> --- a/server/tests/test-listen.c
> +++ b/server/tests/test-listen.c
> @@ -29,6 +29,8 @@
>   #include <gio/gio.h>
>   #include <gio/gunixsocketaddress.h>
>   
> +#include "test-glib-compat.h"
> +
>   /* Arbitrary base port, we want a port which is not in use by the system, and
>    * by another of our tests (in case of parallel runs)
>    */
> @@ -189,8 +191,8 @@ static gpointer check_no_connect_thread(gpointer data)
>       GIOStream *stream;
>   
>       stream = fake_client_connect(connectable, &error);
> -    g_assert(error != NULL);
> -    g_assert(stream == NULL);
> +    g_assert_nonnull(error);
> +    g_assert_null(stream);
>       g_clear_error(&error);
>   
>       g_object_unref(connectable);
>