[cheese] Fix g_assert() use in tests

[David King <davidk src gnome org>]

commit d4f867f9b663167bf3588a0b9fc7e1b6cfb79aec
Author: David King <amigadave amigadave com>
Date:   Sat Mar 9 08:29:45 2019 +0000

    Fix g_assert() use in tests
    
    Rather than using g_assert(), which is disabled if G_DISABLE_ASSERT is
    set, use the g_assert_*() macros that are explicitly intended for use in
    unit tests, and unaffected.
    
    https://gitlab.gnome.org/GNOME/cheese/issues/22

 tests/test-libcheese-gtk.c | 12 +++++------
 tests/test-libcheese.c     | 50 +++++++++++++++++++++++-----------------------
 2 files changed, 31 insertions(+), 31 deletions(-)
---
diff --git a/tests/test-libcheese-gtk.c b/tests/test-libcheese-gtk.c
index 4779c048..5c4c3511 100644
--- a/tests/test-libcheese-gtk.c
+++ b/tests/test-libcheese-gtk.c
@@ -38,12 +38,12 @@ avatar_chooser (void)
     GtkWidget *chooser, *select_button;
 
     chooser = gtk_test_create_widget (CHEESE_TYPE_AVATAR_CHOOSER, NULL);
-    g_assert (chooser != NULL);
+    g_assert_nonnull (chooser);
 
     /* Check that all the child widgets were successfully instantiated. */
     select_button = gtk_test_find_widget (chooser, "Select", GTK_TYPE_BUTTON);
-    g_assert (select_button != NULL);
-    g_assert (GTK_IS_BUTTON (select_button));
+    g_assert_nonnull (select_button);
+    g_assert_true (GTK_IS_BUTTON (select_button));
 }
 
 /* CheeseFlash */
@@ -53,13 +53,13 @@ flash (void)
     GtkWidget *flash, *window;
 
     window = gtk_test_create_simple_window ("CheeseFlash", "CheeseFlash test");
-    g_assert (window != NULL);
+    g_assert_nonnull (window);
 
     /* Window must be realised to have a GdkWindow. */
     gtk_widget_show (window);
 
     flash = gtk_test_create_widget (CHEESE_TYPE_FLASH, "parent", window, NULL);
-    g_assert (flash != NULL);
+    g_assert_nonnull (flash);
 
     cheese_flash_fire (CHEESE_FLASH (flash));
 }
@@ -91,7 +91,7 @@ static void widget (void)
     GtkWidget *widget;
 
     widget = gtk_test_create_widget (CHEESE_TYPE_WIDGET, NULL);
-    g_assert (widget != NULL);
+    g_assert_nonnull (widget);
 }
 
 int main (int argc, gchar *argv[])
diff --git a/tests/test-libcheese.c b/tests/test-libcheese.c
index a87e03ef..1bdaa155 100644
--- a/tests/test-libcheese.c
+++ b/tests/test-libcheese.c
@@ -34,7 +34,7 @@ cameradevicemonitor_create (void)
     CheeseCameraDeviceMonitor *monitor;
 
     monitor = cheese_camera_device_monitor_new ();
-    g_assert (monitor != NULL);
+    g_assert_nonnull (monitor);
 
     cheese_camera_device_monitor_coldplug (monitor);
 
@@ -50,7 +50,7 @@ effect_create (void)
     static const gchar desc[] = "identity";
 
     effect = cheese_effect_new (name, desc);
-    g_assert (effect != NULL);
+    g_assert_nonnull (effect);
 
     g_assert_cmpstr (name, ==, cheese_effect_get_name (effect));
     g_assert_cmpstr (desc, ==, cheese_effect_get_pipeline_desc (effect));
@@ -68,7 +68,7 @@ fileutil_burst (void)
     gchar **split;
 
     fileutil = cheese_fileutil_new ();
-    g_assert (fileutil != NULL);
+    g_assert_nonnull (fileutil);
 
     first_path = cheese_fileutil_get_new_media_filename (fileutil,
         CHEESE_MEDIA_MODE_BURST);
@@ -105,7 +105,7 @@ fileutil_reset_burst (void)
     gchar *first_path, *second_path;
 
     fileutil = cheese_fileutil_new ();
-    g_assert (fileutil != NULL);
+    g_assert_nonnull (fileutil);
 
     first_path = cheese_fileutil_get_new_media_filename (fileutil,
         CHEESE_MEDIA_MODE_BURST);
@@ -115,8 +115,8 @@ fileutil_reset_burst (void)
     second_path = cheese_fileutil_get_new_media_filename (fileutil,
         CHEESE_MEDIA_MODE_BURST);
 
-    g_assert (g_str_has_suffix (first_path, "_1.jpg"));
-    g_assert (g_str_has_suffix (second_path, "_1.jpg"));
+    g_assert_true (g_str_has_suffix (first_path, "_1.jpg"));
+    g_assert_true (g_str_has_suffix (second_path, "_1.jpg"));
     g_assert_cmpstr (first_path, !=, second_path);
 
     g_free (first_path);
@@ -131,25 +131,25 @@ fileutil_new_media_filename (void)
     const gchar *filename;
 
     fileutil = cheese_fileutil_new ();
-    g_assert (fileutil != NULL);
+    g_assert_nonnull (fileutil);
 
     filename = cheese_fileutil_get_new_media_filename (fileutil,
         CHEESE_MEDIA_MODE_PHOTO);
-    g_assert (filename != NULL);
-    g_assert (g_str_has_suffix (filename, CHEESE_PHOTO_NAME_SUFFIX));
-    g_assert (!g_file_test (filename, G_FILE_TEST_EXISTS));
+    g_assert_nonnull (filename);
+    g_assert_true (g_str_has_suffix (filename, CHEESE_PHOTO_NAME_SUFFIX));
+    g_assert_true (!g_file_test (filename, G_FILE_TEST_EXISTS));
 
     filename = cheese_fileutil_get_new_media_filename (fileutil,
         CHEESE_MEDIA_MODE_BURST);
-    g_assert (filename != NULL);
-    g_assert (g_str_has_suffix (filename, CHEESE_PHOTO_NAME_SUFFIX));
-    g_assert (!g_file_test (filename, G_FILE_TEST_EXISTS));
+    g_assert_nonnull (filename);
+    g_assert_true (g_str_has_suffix (filename, CHEESE_PHOTO_NAME_SUFFIX));
+    g_assert_false (g_file_test (filename, G_FILE_TEST_EXISTS));
 
     filename = cheese_fileutil_get_new_media_filename (fileutil,
         CHEESE_MEDIA_MODE_VIDEO);
-    g_assert (filename != NULL);
-    g_assert (g_str_has_suffix (filename, CHEESE_VIDEO_NAME_SUFFIX));
-    g_assert (!g_file_test (filename, G_FILE_TEST_EXISTS));
+    g_assert_nonnull (filename);
+    g_assert_true (g_str_has_suffix (filename, CHEESE_VIDEO_NAME_SUFFIX));
+    g_assert_false (g_file_test (filename, G_FILE_TEST_EXISTS));
 
     g_object_unref (fileutil);
 }
@@ -161,12 +161,12 @@ fileutil_photo_path (void)
     const gchar *path;
 
     fileutil = cheese_fileutil_new ();
-    g_assert (fileutil != NULL);
+    g_assert_nonnull (fileutil);
 
     path = cheese_fileutil_get_photo_path (fileutil);
-    g_assert (path != NULL);
-    g_assert (g_file_test (path, G_FILE_TEST_EXISTS));
-    g_assert (g_file_test (path, G_FILE_TEST_IS_DIR));
+    g_assert_nonnull (path);
+    g_assert_true (g_file_test (path, G_FILE_TEST_EXISTS));
+    g_assert_true (g_file_test (path, G_FILE_TEST_IS_DIR));
 
     g_object_unref (fileutil);
 }
@@ -178,12 +178,12 @@ fileutil_video_path (void)
     const gchar *path;
 
     fileutil = cheese_fileutil_new ();
-    g_assert (fileutil != NULL);
+    g_assert_nonnull (fileutil);
 
     path = cheese_fileutil_get_video_path (fileutil);
-    g_assert (path != NULL);
-    g_assert (g_file_test (path, G_FILE_TEST_EXISTS));
-    g_assert (g_file_test (path, G_FILE_TEST_IS_DIR));
+    g_assert_nonnull (path);
+    g_assert_true (g_file_test (path, G_FILE_TEST_EXISTS));
+    g_assert_true (g_file_test (path, G_FILE_TEST_IS_DIR));
 
     g_object_unref (fileutil);
 }
@@ -196,7 +196,7 @@ videoformat_create (void)
     CheeseVideoFormat format = { 640, 480 };
 
     other = g_boxed_copy (CHEESE_TYPE_VIDEO_FORMAT, &format);
-    g_assert (other != NULL);
+    g_assert_nonnull (other);
     g_assert_cmpint (other->width, ==, format.width);
     g_assert_cmpint (other->height, ==, format.height);