gtk+ r21132 - in trunk: . gdk/tests

[herzi svn gnome org]

Author: herzi
Date: Fri Aug 15 18:50:18 2008
New Revision: 21132
URL: http://svn.gnome.org/viewvc/gtk+?rev=21132&view=rev

Log:
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



Modified:
   trunk/ChangeLog
   trunk/gdk/tests/check-gdk-cairo.c

Modified: trunk/gdk/tests/check-gdk-cairo.c
==============================================================================
--- trunk/gdk/tests/check-gdk-cairo.c	(original)
+++ trunk/gdk/tests/check-gdk-cairo.c	Fri Aug 15 18:50:18 2008
@@ -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 @@
 		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 @@
 			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 ();
 		}
 	}