From efb330447c337a8e325fa561a178fd7c476ea182 Mon Sep 17 00:00:00 2001 From: Sven Herzberg Date: Fri, 15 Aug 2008 18:50:18 +0000 Subject: [PATCH] Prepare for using the g_test_*() API reviewed by: Richard Hult 2008-08-15 Sven Herzberg Prepare for using the g_test_*() API reviewed by: Richard Hult * gdk/tests/check-gdk-cairo.c: use assertions instead of returning an error code svn path=/trunk/; revision=21132 --- ChangeLog | 8 ++++++++ gdk/tests/check-gdk-cairo.c | 23 ++++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb4a66f86d..550ec0a4a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-08-15 Sven Herzberg + + Prepare for using the g_test_*() API + reviewed by: Richard Hult + + * gdk/tests/check-gdk-cairo.c: use assertions instead of returning an + error code + 2008-08-15 Claudio Saavedra Bug 547944 – Self-reference in gtk_page_setup_load_file's docs diff --git a/gdk/tests/check-gdk-cairo.c b/gdk/tests/check-gdk-cairo.c index 5986c06e69..5a0307b989 100644 --- a/gdk/tests/check-gdk-cairo.c +++ b/gdk/tests/check-gdk-cairo.c @@ -23,6 +23,7 @@ * if advised of the possibility of such damage. */ +#include #include #ifdef CAIRO_HAS_QUARTZ_SURFACE #include @@ -106,18 +107,14 @@ main (int argc, g_error ("Eeek! Error loading \"cairosurface.png\""); } - g_return_val_if_fail (gdk_pixbuf_get_width (pbuf_platform) == - gdk_pixbuf_get_width (pbuf_imagesrf), - 1); - g_return_val_if_fail (gdk_pixbuf_get_height (pbuf_platform) == - gdk_pixbuf_get_height (pbuf_imagesrf), - 1); - g_return_val_if_fail (gdk_pixbuf_get_rowstride (pbuf_platform) == - gdk_pixbuf_get_rowstride (pbuf_imagesrf), - 1); - g_return_val_if_fail (gdk_pixbuf_get_n_channels (pbuf_platform) == - gdk_pixbuf_get_n_channels (pbuf_imagesrf), - 1); + g_assert (gdk_pixbuf_get_width (pbuf_platform) == + gdk_pixbuf_get_width (pbuf_imagesrf)); + g_assert (gdk_pixbuf_get_height (pbuf_platform) == + gdk_pixbuf_get_height (pbuf_imagesrf)); + g_assert (gdk_pixbuf_get_rowstride (pbuf_platform) == + gdk_pixbuf_get_rowstride (pbuf_imagesrf)); + g_assert (gdk_pixbuf_get_n_channels (pbuf_platform) == + gdk_pixbuf_get_n_channels (pbuf_imagesrf)); data_platform = gdk_pixbuf_get_pixels (pbuf_platform); data_imagesrf = gdk_pixbuf_get_pixels (pbuf_imagesrf); @@ -127,7 +124,7 @@ main (int argc, g_warning ("Eeek! Images are differing at byte %d", i); g_object_unref (pbuf_platform); g_object_unref (pbuf_imagesrf); - return 1; + g_assert_not_reached (); } }