summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorSven Herzberg <sven@imendio.com>2008-08-15 18:50:18 +0000
committerSven Herzberg <herzi@src.gnome.org>2008-08-15 18:50:18 +0000
commitefb330447c337a8e325fa561a178fd7c476ea182 (patch)
treeea2332a1576a7446de454fb271844624dc4397ad /gdk
parentd061c0942eb124c521ce9e0a96013773924029f9 (diff)
downloadgtk+-efb330447c337a8e325fa561a178fd7c476ea182.tar.gz
Prepare for using the g_test_*() API reviewed by: Richard Hult
2008-08-15 Sven Herzberg <sven@imendio.com> 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
Diffstat (limited to 'gdk')
-rw-r--r--gdk/tests/check-gdk-cairo.c23
1 files changed, 10 insertions, 13 deletions
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 <glib/gstdio.h>
#include <gdk/gdk.h>
#ifdef CAIRO_HAS_QUARTZ_SURFACE
#include <cairo-quartz.h>
@@ -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 ();
}
}