diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-04-13 02:46:07 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-04-13 02:46:07 +0000 |
| commit | 0c3dd0cf308fe51de6693c8bec2fd8a4d5c54c81 (patch) | |
| tree | 7ebff152de6489ec49288a016e896250c5913bc6 | |
| parent | 442f485591b65185538ab941b58743cadd1d2092 (diff) | |
| parent | 4164abd9f708a24d997483bb8fd8558979ed328e (diff) | |
| download | gtk+-0c3dd0cf308fe51de6693c8bec2fd8a4d5c54c81.tar.gz | |
Merge branch 'testsuite-asserts' into 'master'
testsuite: Reduce the use of g_assert
Closes #3864
See merge request GNOME/gtk!3432
92 files changed, 1546 insertions, 1506 deletions
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index 96ec96e476..3253131541 100644 --- a/demos/gtk-demo/main.c +++ b/demos/gtk-demo/main.c @@ -751,7 +751,6 @@ demo_filter_by_name (gpointer item, gpointer user_data) { GtkTreeListRow *row = item; - GtkFilterListModel *model = user_data; GListModel *children; GtkDemo *demo; guint i, n; @@ -762,7 +761,7 @@ demo_filter_by_name (gpointer item, return TRUE; g_assert (GTK_IS_TREE_LIST_ROW (row)); - g_assert (GTK_IS_FILTER_LIST_MODEL (model)); + g_assert (GTK_IS_FILTER_LIST_MODEL (user_data)); /* Show a row if itself of any parent matches */ for (parent = row; parent; parent = gtk_tree_list_row_get_parent (parent)) diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index 5211cbbbda..f065d2cc30 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -848,7 +848,12 @@ gdk_wayland_device_pad_get_n_groups (GdkDevicePad *pad) data = gdk_wayland_seat_find_pad (GDK_WAYLAND_SEAT (seat), GDK_DEVICE (pad)); +#ifdef G_DISABLE_ASSERT + if (data == NULL) + return 0; +#else g_assert (data != NULL); +#endif return g_list_length (data->mode_groups); } @@ -863,7 +868,12 @@ gdk_wayland_device_pad_get_group_n_modes (GdkDevicePad *pad, data = gdk_wayland_seat_find_pad (GDK_WAYLAND_SEAT (seat), GDK_DEVICE (pad)); +#ifdef G_DISABLE_ASSERT + if (data == NULL) + return 0; +#else g_assert (data != NULL); +#endif group = g_list_nth_data (data->mode_groups, n_group); if (!group) @@ -909,7 +919,12 @@ gdk_wayland_device_pad_get_feature_group (GdkDevicePad *pad, data = gdk_wayland_seat_find_pad (GDK_WAYLAND_SEAT (seat), GDK_DEVICE (pad)); +#ifdef G_DISABLE_ASSERT + if (data == NULL) + return -1; +#else g_assert (data != NULL); +#endif for (l = data->mode_groups, i = 0; l; l = l->next, i++) { @@ -4236,7 +4251,14 @@ tablet_pad_handle_button (void *data, wp_tablet_pad, button, state)); group = tablet_pad_lookup_button_group (pad, button); + +#ifdef G_DISABLE_ASSERT + if (group == NULL) + return; +#else g_assert (group != NULL); +#endif + n_group = g_list_index (pad->mode_groups, group); event = gdk_pad_event_new_button (state == ZWP_TABLET_PAD_V2_BUTTON_STATE_PRESSED diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index ba36d0bb82..5a65999682 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -58,6 +58,19 @@ #include "gdk/gdk-private.h" +/* Keep g_assert() defined even if we disable it globally, + * as we use it in many places as a handy mechanism to check + * for non-NULL + */ +#ifdef G_DISABLE_ASSERT +# undef g_assert +# define g_assert(expr) G_STMT_START { \ + if G_LIKELY (expr) ; else \ + g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \ + #expr); \ + } G_STMT_END +#endif + /** * GdkWaylandDisplay: * diff --git a/gsk/gl/gskgldriver.c b/gsk/gl/gskgldriver.c index e1d019c029..621c25825c 100644 --- a/gsk/gl/gskgldriver.c +++ b/gsk/gl/gskgldriver.c @@ -433,8 +433,6 @@ gsk_gl_driver_slice_texture (GskGLDriver *self, guint *out_n_slices) { const int max_texture_size = gsk_gl_driver_get_max_texture_size (self) / 4; // XXX Too much? - const int tex_width = texture->width; - const int tex_height = texture->height; const int cols = (texture->width / max_texture_size) + 1; const int rows = (texture->height / max_texture_size) + 1; int col, row; @@ -442,7 +440,7 @@ gsk_gl_driver_slice_texture (GskGLDriver *self, TextureSlice *slices; Texture *tex; - g_assert (tex_width > max_texture_size || tex_height > max_texture_size); + g_assert (texture->width > max_texture_size || texture->height > max_texture_size); tex = gdk_texture_get_render_data (texture, self); diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c index c72cedaeb4..b7c2ac43c7 100644 --- a/gsk/gl/gskglrenderer.c +++ b/gsk/gl/gskglrenderer.c @@ -1997,12 +1997,11 @@ render_unblurred_inset_shadow_node (GskGLRenderer *self, GskRenderNode *node, RenderOpBuilder *builder) { - const float blur_radius = gsk_inset_shadow_node_get_blur_radius (node); const float dx = gsk_inset_shadow_node_get_dx (node); const float dy = gsk_inset_shadow_node_get_dy (node); const float spread = gsk_inset_shadow_node_get_spread (node); - g_assert (blur_radius == 0); + g_assert (gsk_inset_shadow_node_get_blur_radius (node) == 0); ops_set_program (builder, &self->programs->inset_shadow_program); ops_set_inset_shadow (builder, transform_rect (self, builder, gsk_inset_shadow_node_get_outline (node)), diff --git a/gsk/ngl/gskngltexturelibrary.c b/gsk/ngl/gskngltexturelibrary.c index 2de6e492c5..1e87fc6a6a 100644 --- a/gsk/ngl/gskngltexturelibrary.c +++ b/gsk/ngl/gskngltexturelibrary.c @@ -246,7 +246,7 @@ gsk_ngl_texture_atlas_initialize (GskNglDriver *driver, { /* Insert a single pixel at 0,0 for use in coloring */ - gboolean packed; + gboolean packed G_GNUC_UNUSED; int x, y; guint gl_format; guint gl_type; diff --git a/gtk/a11y/gtkatspicontext.c b/gtk/a11y/gtkatspicontext.c index c55117587b..23d299818c 100644 --- a/gtk/a11y/gtkatspicontext.c +++ b/gtk/a11y/gtkatspicontext.c @@ -1420,7 +1420,7 @@ gtk_at_spi_context_get_property (GObject *gobject, static void gtk_at_spi_context_constructed (GObject *gobject) { - GtkAtSpiContext *self = GTK_AT_SPI_CONTEXT (gobject); + GtkAtSpiContext *self G_GNUC_UNUSED = GTK_AT_SPI_CONTEXT (gobject); /* Make sure that we were properly constructed */ g_assert (self->bus_address); diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index 934bd681f8..53b13c68fd 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -369,7 +369,7 @@ apply_response_for_action_area (GtkDialog *dialog, GtkWidget *child, int response_id) { - GtkDialogPrivate *priv = gtk_dialog_get_instance_private (dialog); + GtkDialogPrivate *priv G_GNUC_UNUSED = gtk_dialog_get_instance_private (dialog); g_assert (gtk_widget_get_parent (child) == priv->action_area); } diff --git a/gtk/gtkexpression.c b/gtk/gtkexpression.c index 5897d8a512..d8e75cddc9 100644 --- a/gtk/gtkexpression.c +++ b/gtk/gtkexpression.c @@ -1935,9 +1935,9 @@ gtk_expression_watch_ref (GtkExpressionWatch *watch) static void gtk_expression_watch_finalize (gpointer data) { - GtkExpressionWatch *watch = data; + GtkExpressionWatch *watch G_GNUC_UNUSED = data; - g_assert (!gtk_expression_watch_is_watching (watch)); + g_assert (!gtk_expression_watch_is_watching (data)); } /** diff --git a/gtk/gtklistitemmanager.c b/gtk/gtklistitemmanager.c index c795653004..3271fe1de4 100644 --- a/gtk/gtklistitemmanager.c +++ b/gtk/gtklistitemmanager.c @@ -104,7 +104,7 @@ gtk_list_item_manager_augment_node (GtkRbTree *tree, static void gtk_list_item_manager_clear_node (gpointer _item) { - GtkListItemManagerItem *item = _item; + GtkListItemManagerItem *item G_GNUC_UNUSED = _item; g_assert (item->widget == NULL); } diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index b88c6ea37d..186bebf6aa 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -320,7 +320,7 @@ static void gtk_settings_class_init (GtkSettingsClass *class) { GObjectClass *gobject_class = G_OBJECT_CLASS (class); - guint result; + guint result G_GNUC_UNUSED; gobject_class->finalize = gtk_settings_finalize; gobject_class->get_property = gtk_settings_get_property; diff --git a/gtk/gtkshortcutaction.c b/gtk/gtkshortcutaction.c index 732dfdf0b9..7870b0465c 100644 --- a/gtk/gtkshortcutaction.c +++ b/gtk/gtkshortcutaction.c @@ -882,7 +882,7 @@ gtk_signal_action_print (GtkShortcutAction *action, static void gtk_signal_action_constructed (GObject *gobject) { - GtkSignalAction *self = GTK_SIGNAL_ACTION (gobject); + GtkSignalAction *self G_GNUC_UNUSED = GTK_SIGNAL_ACTION (gobject); g_assert (self->name != NULL && self->name[0] != '\0'); @@ -1162,7 +1162,7 @@ gtk_named_action_get_property (GObject *gobject, static void gtk_named_action_constructed (GObject *gobject) { - GtkNamedAction *self = GTK_NAMED_ACTION (gobject); + GtkNamedAction *self G_GNUC_UNUSED = GTK_NAMED_ACTION (gobject); g_assert (self->name != NULL && self->name[0] != '\0'); diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c index 854e74fe6f..6bcd1192c4 100644 --- a/gtk/gtktestutils.c +++ b/gtk/gtktestutils.c @@ -80,7 +80,10 @@ gtk_test_init (int *argcp, char ***argvp, ...) { - g_test_init (argcp, argvp, NULL); + /* g_test_init is defined as a macro that aborts if assertions + * are disabled. We don't want that, so we call the function. + */ + (g_test_init) (argcp, argvp, NULL); gtk_disable_setlocale(); setlocale (LC_ALL, "en_US.UTF-8"); diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index f6391c68f8..044f6baaab 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -3513,7 +3513,7 @@ prelight_or_select (GtkTreeView *tree_view, static void ensure_unprelighted (GtkTreeView *tree_view) { - GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); + GtkTreeViewPrivate *priv G_GNUC_UNUSED = gtk_tree_view_get_instance_private (tree_view); do_prelight (tree_view, NULL, NULL, diff --git a/gtk/inspector/window.c b/gtk/inspector/window.c index 3f0d8c031d..1b4560e08e 100644 --- a/gtk/inspector/window.c +++ b/gtk/inspector/window.c @@ -903,6 +903,7 @@ update_go_buttons (GtkInspectorWindow *iw) { object = NULL; kind = CHILD_KIND_OTHER; + position = 0; } if (parent) diff --git a/meson.build b/meson.build index 26cda67aba..eb012b549e 100644 --- a/meson.build +++ b/meson.build @@ -66,7 +66,7 @@ if debug gtk_debug_cflags += '-DG_ENABLE_CONSISTENCY_CHECKS' endif elif optimization in ['2', '3', 's'] - gtk_debug_cflags += '-DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT' + gtk_debug_cflags += ['-DG_DISABLE_CAST_CHECKS', '-DG_DISABLE_ASSERT'] endif add_project_arguments(gtk_debug_cflags, language: 'c') @@ -270,7 +270,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang' '-Wmissing-include-dirs', '-Wmissing-noreturn', '-Wnested-externs', - '-Wnull-dereference', '-Wold-style-definition', '-Wpointer-arith', '-Wshadow', @@ -304,6 +303,10 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang' if cc.get_id() == 'gcc' test_cflags += ['-Wcast-align'] # This warns too much on clang endif + + if not gtk_debug_cflags.contains('-DG_DISABLE_ASSERT') + test_cflags += ['-Wnull-dereference'] # Too noisy when assertions are disabled + endif else test_cflags = [] endif diff --git a/tests/testerrors.c b/tests/testerrors.c index ecdf3c2725..8a68c5eb91 100644 --- a/tests/testerrors.c +++ b/tests/testerrors.c @@ -34,13 +34,13 @@ test_error_trapping (GdkDisplay *gdk_display) gdk_x11_display_error_trap_push (gdk_display); XListProperties (d, 0, &dummy); /* round trip */ error = gdk_x11_display_error_trap_pop (gdk_display); - g_assert (error == BadWindow); + g_assert_true (error == BadWindow); gdk_x11_display_error_trap_push (gdk_display); XSetCloseDownMode (d, 12345); /* not a round trip */ XSetCloseDownMode (d, DestroyAll); error = gdk_x11_display_error_trap_pop (gdk_display); - g_assert (error == BadValue); + g_assert_true (error == BadValue); /* try the same without sync */ gdk_x11_display_error_trap_push (gdk_display); @@ -60,17 +60,17 @@ test_error_trapping (GdkDisplay *gdk_display) gdk_x11_display_error_trap_push (gdk_display); XSetCloseDownMode (d, 12345); error = gdk_x11_display_error_trap_pop (gdk_display); - g_assert (error == BadValue); + g_assert_true (error == BadValue); error = gdk_x11_display_error_trap_pop (gdk_display); - g_assert (error == Success); + g_assert_true (error == Success); gdk_x11_display_error_trap_push (gdk_display); XSetCloseDownMode (d, 12345); gdk_x11_display_error_trap_push (gdk_display); error = gdk_x11_display_error_trap_pop (gdk_display); - g_assert (error == Success); + g_assert_true (error == Success); error = gdk_x11_display_error_trap_pop (gdk_display); - g_assert (error == BadValue); + g_assert_true (error == BadValue); /* try nested, without sync */ gdk_x11_display_error_trap_push (gdk_display); @@ -104,23 +104,23 @@ test_error_trapping (GdkDisplay *gdk_display) gdk_x11_display_error_trap_push (gdk_display); XSync (d, TRUE); /* not an error */ error = gdk_x11_display_error_trap_pop (gdk_display); - g_assert (error == Success); + g_assert_true (error == Success); error = gdk_x11_display_error_trap_pop (gdk_display); - g_assert (error == BadValue); + g_assert_true (error == BadValue); /* non-roundtrip non-error request after error request, inside trap */ gdk_x11_display_error_trap_push (gdk_display); XSetCloseDownMode (d, 12345); XMapWindow (d, DefaultRootWindow (d)); error = gdk_x11_display_error_trap_pop (gdk_display); - g_assert (error == BadValue); + g_assert_true (error == BadValue); /* a non-roundtrip non-error request before error request, inside trap */ gdk_x11_display_error_trap_push (gdk_display); XMapWindow (d, DefaultRootWindow (d)); XSetCloseDownMode (d, 12345); error = gdk_x11_display_error_trap_pop (gdk_display); - g_assert (error == BadValue); + g_assert_true (error == BadValue); /* Not part of any test, just a double-check * that all errors have arrived diff --git a/testsuite/css/data.c b/testsuite/css/data.c index 9cb3544de6..3a5b722fd0 100644 --- a/testsuite/css/data.c +++ b/testsuite/css/data.c @@ -105,7 +105,7 @@ main (int argc, char *argv[]) { guint i; - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); for (i = 0; i < G_N_ELEMENTS (tests); i++) diff --git a/testsuite/gdk/array.c b/testsuite/gdk/array.c index f9d5677b2c..400bdc5ba9 100644 --- a/testsuite/gdk/array.c +++ b/testsuite/gdk/array.c @@ -81,7 +81,7 @@ int_free_func (int data) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); g_test_add_func ("/intarray/simple", int_array_test_simple); diff --git a/testsuite/gdk/cairo.c b/testsuite/gdk/cairo.c index 071ca33767..9f8f172411 100644 --- a/testsuite/gdk/cairo.c +++ b/testsuite/gdk/cairo.c @@ -31,7 +31,7 @@ test_set_source_big_pixbuf (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); gtk_init (); g_test_add_func ("/drawing/set-source-big-pixbuf", test_set_source_big_pixbuf); diff --git a/testsuite/gdk/clipboard.c b/testsuite/gdk/clipboard.c index 741899401f..aa3b1055f2 100644 --- a/testsuite/gdk/clipboard.c +++ b/testsuite/gdk/clipboard.c @@ -73,7 +73,7 @@ test_clipboard_basic (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); gtk_init (); diff --git a/testsuite/gdk/cursor.c b/testsuite/gdk/cursor.c index 546f73bd39..e9c42671e9 100644 --- a/testsuite/gdk/cursor.c +++ b/testsuite/gdk/cursor.c @@ -57,7 +57,7 @@ test_cursor_fallback (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); gtk_init (); diff --git a/testsuite/gdk/display.c b/testsuite/gdk/display.c index 1cda169a5b..bf87567de2 100644 --- a/testsuite/gdk/display.c +++ b/testsuite/gdk/display.c @@ -68,7 +68,7 @@ test_bad_display (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); gdk_set_allowed_backends ("x11"); diff --git a/testsuite/gdk/displaymanager.c b/testsuite/gdk/displaymanager.c index ce7c0d974f..89627444e7 100644 --- a/testsuite/gdk/displaymanager.c +++ b/testsuite/gdk/displaymanager.c @@ -43,7 +43,7 @@ test_set_default (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); /* Open default display */ gdk_display_open (NULL); diff --git a/testsuite/gdk/encoding.c b/testsuite/gdk/encoding.c index 53b23aaeee..90edba19fd 100644 --- a/testsuite/gdk/encoding.c +++ b/testsuite/gdk/encoding.c @@ -37,7 +37,7 @@ test_to_text_list (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); gtk_init (); g_test_add_func ("/encoding/to-text-list", test_to_text_list); diff --git a/testsuite/gdk/keysyms.c b/testsuite/gdk/keysyms.c index 481aafae4c..3d4480ebb9 100644 --- a/testsuite/gdk/keysyms.c +++ b/testsuite/gdk/keysyms.c @@ -128,7 +128,7 @@ main (int argc, char *argv[]) { setlocale (LC_ALL, ""); - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); gtk_init (); g_test_add_func ("/keysyms/basic", test_keysyms_basic); diff --git a/testsuite/gdk/memorytexture.c b/testsuite/gdk/memorytexture.c index 950de41b0a..ea24c827e3 100644 --- a/testsuite/gdk/memorytexture.c +++ b/testsuite/gdk/memorytexture.c @@ -180,7 +180,7 @@ main (int argc, char *argv[]) Color color; GEnumClass *enum_class; - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); enum_class = g_type_class_ref (GDK_TYPE_MEMORY_FORMAT); diff --git a/testsuite/gdk/pixbuf.c b/testsuite/gdk/pixbuf.c index 591444fd86..62d68c3a77 100644 --- a/testsuite/gdk/pixbuf.c +++ b/testsuite/gdk/pixbuf.c @@ -33,7 +33,7 @@ test_format (gconstpointer d) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); g_test_add_data_func ("/pixbuf/format/png", "png", test_format); g_test_add_data_func ("/pixbuf/format/jpeg", "jpeg", test_format); diff --git a/testsuite/gdk/rectangle.c b/testsuite/gdk/rectangle.c index bf8f9983b3..bfab177a28 100644 --- a/testsuite/gdk/rectangle.c +++ b/testsuite/gdk/rectangle.c @@ -110,7 +110,7 @@ test_rectangle_contains (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); gtk_init (); diff --git a/testsuite/gdk/rgba.c b/testsuite/gdk/rgba.c index e92fd04c41..0ab68f429d 100644 --- a/testsuite/gdk/rgba.c +++ b/testsuite/gdk/rgba.c @@ -159,7 +159,7 @@ test_color_parse_nonsense (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); g_test_add_func ("/rgba/parse", test_color_parse); g_test_add_func ("/rgba/parse/nonsense", test_color_parse_nonsense); diff --git a/testsuite/gdk/seat.c b/testsuite/gdk/seat.c index 8949350cbc..266f6d5a11 100644 --- a/testsuite/gdk/seat.c +++ b/testsuite/gdk/seat.c @@ -127,7 +127,7 @@ test_default_seat (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); gtk_init (); diff --git a/testsuite/gsk/compare-render.c b/testsuite/gsk/compare-render.c index 462953ef9f..5494c61d1e 100644 --- a/testsuite/gsk/compare-render.c +++ b/testsuite/gsk/compare-render.c @@ -104,9 +104,11 @@ save_image (cairo_surface_t *surface, const char *extension) { char *filename = get_output_file (test_name, ".node", extension); + int status; g_print ("Storing test result image at %s\n", filename); - g_assert (cairo_surface_write_to_png (surface, filename) == CAIRO_STATUS_SUCCESS); + status = cairo_surface_write_to_png (surface, filename); + g_assert_true (status == CAIRO_STATUS_SUCCESS); g_free (filename); } @@ -207,12 +209,12 @@ main (int argc, char **argv) g_bytes_unref (bytes); g_assert_no_error (error); - g_assert (node != NULL); + g_assert_nonnull (node); } /* Render the .node file and download to cairo surface */ texture = gsk_renderer_render_texture (renderer, node, NULL); - g_assert (texture != NULL); + g_assert_nonnull (texture); rendered_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, gdk_texture_get_width (texture), diff --git a/testsuite/gsk/node-parser.c b/testsuite/gsk/node-parser.c index 3c4f61b817..749039ff29 100644 --- a/testsuite/gsk/node-parser.c +++ b/testsuite/gsk/node-parser.c @@ -173,7 +173,7 @@ parse_node_file (GFile *file, gboolean generate) g_clear_error (&error); return FALSE; } - g_assert (bytes != NULL); + g_assert_nonnull (bytes); errors = g_string_new (""); diff --git a/testsuite/gsk/transform.c b/testsuite/gsk/transform.c index 9a2fa1ffe3..caf9f72b69 100644 --- a/testsuite/gsk/transform.c +++ b/testsuite/gsk/transform.c @@ -266,7 +266,7 @@ test_invert (void) transform = apply_test_transform (transform, j); transform = apply_test_transform (transform, k); inverse = gsk_transform_invert (gsk_transform_ref (transform)); - g_assert (inverse != NULL || transform == NULL); + g_assert_true (inverse != NULL || transform == NULL); identity = gsk_transform_transform (gsk_transform_ref (transform), inverse); graphene_assert_fuzzy_transform_equal (identity, NULL, EPSILON); @@ -372,6 +372,7 @@ test_print_parse (void) GskTransform *transform, *parsed; guint i, j, k; char *str1, *str2; + gboolean ret; for (i = 0; i < G_N_ELEMENTS (test_transforms); i++) { @@ -384,14 +385,15 @@ test_print_parse (void) transform = apply_test_transform (transform, k); str1 = gsk_transform_to_string (transform); - g_assert (str1); - g_assert (strlen (str1) > 0); + g_assert_nonnull (str1); + g_assert_true (strlen (str1) > 0); str2 = gsk_transform_to_string (transform); g_assert_cmpstr (str1, ==, str2); g_free (str2); - g_assert (gsk_transform_parse (str1, &parsed)); + ret = gsk_transform_parse (str1, &parsed); + g_assert_true (ret); graphene_assert_fuzzy_transform_equal (parsed, transform, EPSILON); str2 = gsk_transform_to_string (parsed); diff --git a/testsuite/gtk/accel.c b/testsuite/gtk/accel.c index 559635160e..291cfe6195 100644 --- a/testsuite/gtk/accel.c +++ b/testsuite/gtk/accel.c @@ -28,31 +28,32 @@ test_one_accel (const char *accel, GdkModifierType mods; guint *keycodes; char *label, *name; + gboolean ret; accel_key = 0; - g_assert (gtk_accelerator_parse_with_keycode (accel, - gdk_display_get_default (), - &accel_key, - &keycodes, - &mods)); + ret = gtk_accelerator_parse_with_keycode (accel, + gdk_display_get_default (), + &accel_key, + &keycodes, + &mods); + g_assert_true (ret); if (has_keysym) { guint accel_key_2; GdkModifierType mods_2; - g_assert (gtk_accelerator_parse (accel, - &accel_key_2, - &mods_2)); - g_assert (accel_key == accel_key_2); - g_assert (mods == mods_2); + ret = gtk_accelerator_parse (accel, &accel_key_2, &mods_2); + g_assert_true (ret); + g_assert_true (accel_key == accel_key_2); + g_assert_true (mods == mods_2); } if (has_keysym) - g_assert (accel_key == exp_key); - g_assert (mods == exp_mods); - g_assert (keycodes); - g_assert (keycodes[0] != 0); + g_assert_true (accel_key == exp_key); + g_assert_true (mods == exp_mods); + g_assert_nonnull (keycodes); + g_assert_true (keycodes[0] != 0); label = gtk_accelerator_get_label_with_keycode (NULL, accel_key, @@ -123,7 +124,7 @@ accel8 (void) static void keysyms (void) { - g_assert (gdk_keyval_from_name ("KP_7") == GDK_KEY_KP_7); + g_assert_cmpuint (gdk_keyval_from_name ("KP_7"), ==, GDK_KEY_KP_7); } int diff --git a/testsuite/gtk/action.c b/testsuite/gtk/action.c index 97a607d53a..95bb071d4b 100644 --- a/testsuite/gtk/action.c +++ b/testsuite/gtk/action.c @@ -676,7 +676,7 @@ test_introspection (void) if (strcmp (expected[i].name, name) == 0) { found++; - g_assert (expected[i].owner == owner); + g_assert_true (expected[i].owner == owner); g_assert_cmpstr (expected[i].name, ==, name); g_assert_cmpstr (expected[i].params, ==, params ? g_variant_type_peek_string (params) : NULL); g_assert_cmpstr (expected[i].property, ==, property); @@ -687,7 +687,7 @@ test_introspection (void) g_error ("Unexpected GtkText action: %s", name); j++; } - g_assert (found == G_N_ELEMENTS (expected)); + g_assert_cmpuint (found, ==, G_N_ELEMENTS (expected)); g_type_class_unref (class); } diff --git a/testsuite/gtk/bitmask.c b/testsuite/gtk/bitmask.c index 167e729ea7..e73d486322 100644 --- a/testsuite/gtk/bitmask.c +++ b/testsuite/gtk/bitmask.c @@ -458,7 +458,7 @@ main (int argc, char *argv[]) { int result; - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); create_masks (); diff --git a/testsuite/gtk/bitset.c b/testsuite/gtk/bitset.c index 2c01912317..655d95b110 100644 --- a/testsuite/gtk/bitset.c +++ b/testsuite/gtk/bitset.c @@ -561,7 +561,7 @@ test_splice_overflow (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); g_test_add_func ("/bitset/is_empty", test_is_empty); diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c index 51f53bd5bd..e581a7c512 100644 --- a/testsuite/gtk/builder.c +++ b/testsuite/gtk/builder.c @@ -132,9 +132,9 @@ static int object_after = 0; void /* exported for GtkBuilder */ signal_normal (GtkWindow *window, GParamSpec *spec) { - g_assert (GTK_IS_WINDOW (window)); - g_assert (normal == 0); - g_assert (after == 0); + g_assert_true (GTK_IS_WINDOW (window)); + g_assert_true (normal == 0); + g_assert_true (after == 0); normal++; } @@ -142,9 +142,9 @@ signal_normal (GtkWindow *window, GParamSpec *spec) void /* exported for GtkBuilder */ signal_after (GtkWindow *window, GParamSpec *spec) { - g_assert (GTK_IS_WINDOW (window)); - g_assert (normal == 1); - g_assert (after == 0); + g_assert_true (GTK_IS_WINDOW (window)); + g_assert_true (normal == 1); + g_assert_true (after == 0); after++; } @@ -152,9 +152,9 @@ signal_after (GtkWindow *window, GParamSpec *spec) void /* exported for GtkBuilder */ signal_object (GtkButton *button, GParamSpec *spec) { - g_assert (GTK_IS_BUTTON (button)); - g_assert (object == 0); - g_assert (object_after == 0); + g_assert_true (GTK_IS_BUTTON (button)); + g_assert_true (object == 0); + g_assert_true (object_after == 0); object++; } @@ -162,9 +162,9 @@ signal_object (GtkButton *button, GParamSpec *spec) void /* exported for GtkBuilder */ signal_object_after (GtkButton *button, GParamSpec *spec) { - g_assert (GTK_IS_BUTTON (button)); - g_assert (object == 1); - g_assert (object_after == 0); + g_assert_true (GTK_IS_BUTTON (button)); + g_assert_true (object == 1); + g_assert_true (object_after == 0); object_after++; } @@ -172,28 +172,28 @@ signal_object_after (GtkButton *button, GParamSpec *spec) void /* exported for GtkBuilder */ signal_first (GtkButton *button, GParamSpec *spec) { - g_assert (normal == 0); + g_assert_true (normal == 0); normal = 10; } void /* exported for GtkBuilder */ signal_second (GtkButton *button, GParamSpec *spec) { - g_assert (normal == 10); + g_assert_true (normal == 10); normal = 20; } void /* exported for GtkBuilder */ signal_extra (GtkButton *button, GParamSpec *spec) { - g_assert (normal == 20); + g_assert_true (normal == 20); normal = 30; } void /* exported for GtkBuilder */ signal_extra2 (GtkButton *button, GParamSpec *spec) { - g_assert (normal == 30); + g_assert_true (normal == 30); normal = 40; } @@ -260,7 +260,7 @@ test_connect_signals (void) window = gtk_builder_get_object (builder, "window1"); normal = 0; gtk_window_set_title (GTK_WINDOW (window), "test"); - g_assert (normal == 20); + g_assert_true (normal == 20); gtk_window_destroy (GTK_WINDOW (window)); @@ -270,12 +270,12 @@ test_connect_signals (void) strlen (buffer_extra2), NULL); window = gtk_builder_get_object (builder, "window2"); gtk_window_set_title (GTK_WINDOW (window), "test"); - g_assert (normal == 30); + g_assert_true (normal == 30); gtk_window_destroy (GTK_WINDOW (window)); window = gtk_builder_get_object (builder, "window3"); gtk_window_set_title (GTK_WINDOW (window), "test"); - g_assert (normal == 40); + g_assert_true (normal == 40); gtk_window_destroy (GTK_WINDOW (window)); g_object_unref (builder); @@ -288,7 +288,7 @@ test_connect_signals (void) window = gtk_builder_get_object (builder, "window1"); gtk_window_set_title (GTK_WINDOW (window), "test"); - g_assert (normal == 1); + g_assert_true (normal == 1); gtk_window_destroy (GTK_WINDOW (window)); g_object_unref (builder); } @@ -303,18 +303,18 @@ test_domain (void) builder = builder_new_from_string (buffer1, -1, NULL); domain = gtk_builder_get_translation_domain (builder); - g_assert (domain == NULL); + g_assert_true (domain == NULL); g_object_unref (builder); builder = builder_new_from_string (buffer1, -1, "domain-1"); domain = gtk_builder_get_translation_domain (builder); - g_assert (domain); - g_assert (strcmp (domain, "domain-1") == 0); + g_assert_nonnull (domain); + g_assert_true (strcmp (domain, "domain-1") == 0); g_object_unref (builder); builder = builder_new_from_string (buffer2, -1, NULL); domain = gtk_builder_get_translation_domain (builder); - g_assert (domain == NULL); + g_assert_null (domain); g_object_unref (builder); } @@ -341,7 +341,7 @@ test_translation (void) builder = builder_new_from_string (buffer, -1, NULL); label = GTK_LABEL (gtk_builder_get_object (builder, "label")); - g_assert (strcmp (gtk_label_get_text (label), "Arkiv") == 0); + g_assert_true (strcmp (gtk_label_get_text (label), "Arkiv") == 0); window = gtk_builder_get_object (builder, "window1"); gtk_window_destroy (GTK_WINDOW (window)); @@ -420,25 +420,25 @@ test_sizegroup (void) builder = builder_new_from_string (buffer1, -1, NULL); sizegroup = gtk_builder_get_object (builder, "sizegroup1"); widgets = gtk_size_group_get_widgets (GTK_SIZE_GROUP (sizegroup)); - g_assert (g_slist_length (widgets) == 2); + g_assert_cmpint (g_slist_length (widgets), ==, 2); g_slist_free (widgets); g_object_unref (builder); builder = builder_new_from_string (buffer2, -1, NULL); sizegroup = gtk_builder_get_object (builder, "sizegroup1"); widgets = gtk_size_group_get_widgets (GTK_SIZE_GROUP (sizegroup)); - g_assert (g_slist_length (widgets) == 0); + g_assert_cmpint (g_slist_length (widgets), ==, 0); g_slist_free (widgets); g_object_unref (builder); builder = builder_new_from_string (buffer3, -1, NULL); sizegroup = gtk_builder_get_object (builder, "sizegroup1"); widgets = gtk_size_group_get_widgets (GTK_SIZE_GROUP (sizegroup)); - g_assert (g_slist_length (widgets) == 2); + g_assert_cmpint (g_slist_length (widgets), ==, 2); g_slist_free (widgets); sizegroup = gtk_builder_get_object (builder, "sizegroup2"); widgets = gtk_size_group_get_widgets (GTK_SIZE_GROUP (sizegroup)); - g_assert (g_slist_length (widgets) == 2); + g_assert_cmpint (g_slist_length (widgets), ==, 2); g_slist_free (widgets); #if 0 @@ -518,94 +518,86 @@ test_list_store (void) builder = builder_new_from_string (buffer1, -1, NULL); store = gtk_builder_get_object (builder, "liststore1"); - g_assert (gtk_tree_model_get_n_columns (GTK_TREE_MODEL (store)) == 2); - g_assert (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 0) == G_TYPE_STRING); - g_assert (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 1) == G_TYPE_UINT); + g_assert_cmpint (gtk_tree_model_get_n_columns (GTK_TREE_MODEL (store)), ==, 2); + g_assert_cmpint (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 0), ==, G_TYPE_STRING); + g_assert_cmpint (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 1), ==, G_TYPE_UINT); g_object_unref (builder); builder = builder_new_from_string (buffer2, -1, NULL); store = gtk_builder_get_object (builder, "liststore1"); - g_assert (gtk_tree_model_get_n_columns (GTK_TREE_MODEL (store)) == 3); - g_assert (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 0) == G_TYPE_STRING); - g_assert (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 1) == G_TYPE_STRING); - g_assert (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 2) == G_TYPE_INT); + g_assert_cmpint (gtk_tree_model_get_n_columns (GTK_TREE_MODEL (store)), ==, 3); + g_assert_cmpint (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 0), ==, G_TYPE_STRING); + g_assert_cmpint (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 1), ==, G_TYPE_STRING); + g_assert_cmpint (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 2), ==, G_TYPE_INT); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter) == TRUE); + g_assert_cmpint (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter), ==, TRUE); gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, 0, &surname, 1, &lastname, 2, &age, -1); - g_assert (surname != NULL); - g_assert (strcmp (surname, "John") == 0); + g_assert_cmpstr (surname, ==, "John"); g_free (surname); - g_assert (lastname != NULL); - g_assert (strcmp (lastname, "Doe") == 0); + g_assert_cmpstr (lastname, ==, "Doe"); g_free (lastname); - g_assert (age == 25); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter) == TRUE); + g_assert_cmpint (age, ==, 25); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter)); gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, 0, &surname, 1, &lastname, 2, &age, -1); - g_assert (surname != NULL); - g_assert (strcmp (surname, "Johan") == 0); + g_assert_cmpstr (surname, ==, "Johan"); g_free (surname); - g_assert (lastname != NULL); - g_assert (strcmp (lastname, "Dole") == 0); + g_assert_cmpstr (lastname, ==, "Dole"); g_free (lastname); - g_assert (age == 50); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter) == FALSE); + g_assert_cmpint (age, ==, 50); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter)); g_object_unref (builder); builder = builder_new_from_string (buffer3, -1, NULL); store = gtk_builder_get_object (builder, "liststore1"); - g_assert (gtk_tree_model_get_n_columns (GTK_TREE_MODEL (store)) == 3); - g_assert (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 0) == G_TYPE_STRING); - g_assert (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 1) == G_TYPE_STRING); - g_assert (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 2) == G_TYPE_INT); + g_assert_cmpint (gtk_tree_model_get_n_columns (GTK_TREE_MODEL (store)), ==, 3); + g_assert_cmpint (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 0), ==, G_TYPE_STRING); + g_assert_cmpint (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 1), ==, G_TYPE_STRING); + g_assert_cmpint (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 2), ==, G_TYPE_INT); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter) == TRUE); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, 0, &surname, 1, &lastname, 2, &age, -1); - g_assert (surname != NULL); - g_assert (strcmp (surname, "John") == 0); + g_assert_cmpstr (surname, ==, "John"); g_free (surname); - g_assert (lastname != NULL); - g_assert (strcmp (lastname, "Doe") == 0); + g_assert_cmpstr (lastname, ==, "Doe"); g_free (lastname); - g_assert (age == 25); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter) == TRUE); + g_assert_cmpint (age, ==, 25); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter)); gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, 0, &surname, 1, &lastname, 2, &age, -1); - g_assert (surname != NULL); - g_assert (strcmp (surname, "Johan") == 0); + g_assert_cmpstr (surname, ==, "Johan"); g_free (surname); - g_assert (lastname != NULL); - g_assert (strcmp (lastname, "Dole") == 0); + g_assert_cmpstr (lastname, ==, "Dole"); g_free (lastname); - g_assert (age == 50); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter) == TRUE); + g_assert_cmpint (age, ==, 50); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter)); gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, 0, &surname, 1, &lastname, 2, &age, -1); - g_assert (surname == NULL); - g_assert (lastname == NULL); - g_assert (age == 19); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter) == FALSE); + g_assert_null (surname); + g_assert_null (lastname); + g_assert_cmpint (age, ==, 19); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter)); g_object_unref (builder); } @@ -627,10 +619,10 @@ test_tree_store (void) builder = builder_new_from_string (buffer, -1, NULL); store = gtk_builder_get_object (builder, "treestore1"); - g_assert (gtk_tree_model_get_n_columns (GTK_TREE_MODEL (store)) == 2); - g_assert (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 0) == G_TYPE_STRING); - g_assert (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 1) == G_TYPE_UINT); - + g_assert_cmpint (gtk_tree_model_get_n_columns (GTK_TREE_MODEL (store)), ==, 2); + g_assert_cmpint (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 0), ==, G_TYPE_STRING); + g_assert_cmpint (gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), 1), ==, G_TYPE_UINT); + g_object_unref (builder); } @@ -689,13 +681,13 @@ test_types (void) builder = builder_new_from_string (buffer2, -1, NULL); window = gtk_builder_get_object (builder, "window"); - g_assert (GTK_IS_WINDOW (window)); + g_assert_true (GTK_IS_WINDOW (window)); gtk_window_destroy (GTK_WINDOW (window)); g_object_unref (builder); builder = builder_new_from_string (buffer3, -1, NULL); window = gtk_builder_get_object (builder, "window"); - g_assert (GTK_IS_WINDOW (window)); + g_assert_true (GTK_IS_WINDOW (window)); gtk_window_destroy (GTK_WINDOW (window)); g_object_unref (builder); @@ -739,21 +731,21 @@ test_spin_button (void) builder = builder_new_from_string (buffer, -1, NULL); obj = gtk_builder_get_object (builder, "spinbutton1"); - g_assert (GTK_IS_SPIN_BUTTON (obj)); + g_assert_true (GTK_IS_SPIN_BUTTON (obj)); adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (obj)); - g_assert (GTK_IS_ADJUSTMENT (adjustment)); + g_assert_true (GTK_IS_ADJUSTMENT (adjustment)); g_object_get (adjustment, "value", &value, NULL); - g_assert (value == 1); + g_assert_cmpint (value, ==, 1); g_object_get (adjustment, "lower", &value, NULL); - g_assert (value == 0); + g_assert_cmpint (value, ==, 0); g_object_get (adjustment, "upper", &value, NULL); - g_assert (value == 10); + g_assert_cmpint (value, ==, 10); g_object_get (adjustment, "step-increment", &value, NULL); - g_assert (value == 2); + g_assert_cmpint (value, ==, 2); g_object_get (adjustment, "page-increment", &value, NULL); - g_assert (value == 3); + g_assert_cmpint (value, ==, 3); g_object_get (adjustment, "page-size", &value, NULL); - g_assert (value == 0); + g_assert_cmpint (value, ==, 0); g_object_unref (builder); } @@ -800,22 +792,22 @@ test_notebook (void) builder = builder_new_from_string (buffer, -1, NULL); notebook = gtk_builder_get_object (builder, "notebook1"); - g_assert (notebook != NULL); - g_assert (gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)) == 2); + g_assert_nonnull (notebook); + g_assert_cmpint (gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)), ==, 2); label = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0); - g_assert (GTK_IS_LABEL (label)); - g_assert (strcmp (gtk_label_get_label (GTK_LABEL (label)), "label1") == 0); + g_assert_true (GTK_IS_LABEL (label)); + g_assert_cmpstr (gtk_label_get_label (GTK_LABEL (label)), ==, "label1"); label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (notebook), label); - g_assert (GTK_IS_LABEL (label)); - g_assert (strcmp (gtk_label_get_label (GTK_LABEL (label)), "tab_label1") == 0); + g_assert_true (GTK_IS_LABEL (label)); + g_assert_cmpstr (gtk_label_get_label (GTK_LABEL (label)), ==, "tab_label1"); label = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1); - g_assert (GTK_IS_LABEL (label)); - g_assert (strcmp (gtk_label_get_label (GTK_LABEL (label)), "label2") == 0); + g_assert_true (GTK_IS_LABEL (label)); + g_assert_cmpstr (gtk_label_get_label (GTK_LABEL (label)), ==, "label2"); label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (notebook), label); - g_assert (GTK_IS_LABEL (label)); - g_assert (strcmp (gtk_label_get_label (GTK_LABEL (label)), "tab_label2") == 0); + g_assert_true (GTK_IS_LABEL (label)); + g_assert_cmpstr (gtk_label_get_label (GTK_LABEL (label)), ==, "tab_label2"); g_object_unref (builder); } @@ -848,9 +840,9 @@ test_construct_only_property (void) builder = builder_new_from_string (buffer2, -1, NULL); textbuffer = gtk_builder_get_object (builder, "textbuffer1"); - g_assert (textbuffer != NULL); + g_assert_nonnull (textbuffer); g_object_get (textbuffer, "tag-table", &tagtable, NULL); - g_assert (tagtable == gtk_builder_get_object (builder, "tagtable1")); + g_assert_true (tagtable == gtk_builder_get_object (builder, "tagtable1")); g_object_unref (tagtable); g_object_unref (builder); } @@ -885,14 +877,14 @@ test_object_properties (void) builder = builder_new_from_string (buffer, -1, NULL); label = gtk_builder_get_object (builder, "label1"); - g_assert (label != NULL); + g_assert_nonnull (label); spinbutton = gtk_builder_get_object (builder, "spinbutton1"); - g_assert (spinbutton != NULL); - g_assert (spinbutton == (GObject*)gtk_label_get_mnemonic_widget (GTK_LABEL (label))); + g_assert_nonnull (spinbutton); + g_assert_true (spinbutton == (GObject*)gtk_label_get_mnemonic_widget (GTK_LABEL (label))); gtk_builder_add_from_string (builder, buffer2, -1, NULL); window = gtk_builder_get_object (builder, "window2"); - g_assert (window != NULL); + g_assert_nonnull (window); gtk_window_destroy (GTK_WINDOW (window)); g_object_unref (builder); @@ -937,22 +929,19 @@ test_children (void) builder = builder_new_from_string (buffer1, -1, NULL); window = gtk_builder_get_object (builder, "window1"); - g_assert (window != NULL); - g_assert (GTK_IS_WINDOW (window)); + g_assert_true (GTK_IS_WINDOW (window)); button = gtk_builder_get_object (builder, "button1"); - g_assert (button != NULL); - g_assert (GTK_IS_BUTTON (button)); - g_assert (gtk_widget_get_parent (GTK_WIDGET(button)) != NULL); - g_assert (strcmp (gtk_buildable_get_buildable_id (GTK_BUILDABLE (gtk_widget_get_parent (GTK_WIDGET (button)))), "window1") == 0); + g_assert_true (GTK_IS_BUTTON (button)); + g_assert_nonnull (gtk_widget_get_parent (GTK_WIDGET(button))); + g_assert_cmpstr (gtk_buildable_get_buildable_id (GTK_BUILDABLE (gtk_widget_get_parent (GTK_WIDGET (button)))), ==, "window1"); gtk_window_destroy (GTK_WINDOW (window)); g_object_unref (builder); builder = builder_new_from_string (buffer2, -1, NULL); dialog = gtk_builder_get_object (builder, "dialog1"); - g_assert (dialog != NULL); - g_assert (GTK_IS_DIALOG (dialog)); + g_assert_true (GTK_IS_DIALOG (dialog)); count = 0; for (child = gtk_widget_get_first_child (GTK_WIDGET (dialog)); child != NULL; @@ -962,17 +951,15 @@ test_children (void) vbox = gtk_builder_get_object (builder, "dialog1-vbox"); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - g_assert (vbox != NULL); - g_assert (GTK_IS_BOX (vbox)); - g_assert (gtk_orientable_get_orientation (GTK_ORIENTABLE (vbox)) == GTK_ORIENTATION_VERTICAL); - g_assert (strcmp (gtk_buildable_get_buildable_id (GTK_BUILDABLE (content_area)), "dialog1-vbox") == 0); + g_assert_true (GTK_IS_BOX (vbox)); + g_assert_cmpint (gtk_orientable_get_orientation (GTK_ORIENTABLE (vbox)), ==, GTK_ORIENTATION_VERTICAL); + g_assert_cmpstr (gtk_buildable_get_buildable_id (GTK_BUILDABLE (content_area)), ==, "dialog1-vbox"); action_area = gtk_builder_get_object (builder, "dialog1-action_area"); - g_assert (action_area != NULL); - g_assert (GTK_IS_BOX (action_area)); - g_assert (gtk_orientable_get_orientation (GTK_ORIENTABLE (action_area)) == GTK_ORIENTATION_HORIZONTAL); - g_assert (gtk_widget_get_parent (GTK_WIDGET (action_area)) != NULL); - g_assert (gtk_buildable_get_buildable_id (GTK_BUILDABLE (action_area)) != NULL); + g_assert_true (GTK_IS_BOX (action_area)); + g_assert_cmpint (gtk_orientable_get_orientation (GTK_ORIENTABLE (action_area)), ==, GTK_ORIENTATION_HORIZONTAL); + g_assert_nonnull (gtk_widget_get_parent (GTK_WIDGET (action_area))); + g_assert_nonnull (gtk_buildable_get_buildable_id (GTK_BUILDABLE (action_area))); gtk_window_destroy (GTK_WINDOW (dialog)); g_object_unref (builder); } @@ -1005,13 +992,13 @@ test_layout_properties (void) builder = builder_new_from_string (buffer1, -1, NULL); vbox = gtk_builder_get_object (builder, "grid1"); - g_assert (GTK_IS_GRID (vbox)); + g_assert_true (GTK_IS_GRID (vbox)); label = gtk_builder_get_object (builder, "label1"); - g_assert (GTK_IS_LABEL (label)); + g_assert_true (GTK_IS_LABEL (label)); label = gtk_builder_get_object (builder, "label2"); - g_assert (GTK_IS_LABEL (label)); + g_assert_true (GTK_IS_LABEL (label)); g_object_unref (builder); } @@ -1072,17 +1059,15 @@ test_treeview_column (void) builder = builder_new_from_string (buffer, -1, NULL); treeview = gtk_builder_get_object (builder, "treeview1"); - g_assert (treeview); - g_assert (GTK_IS_TREE_VIEW (treeview)); + g_assert_true (GTK_IS_TREE_VIEW (treeview)); column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), 0); - g_assert (GTK_IS_TREE_VIEW_COLUMN (column)); - g_assert (strcmp (gtk_tree_view_column_get_title (column), "Test") == 0); + g_assert_true (GTK_IS_TREE_VIEW_COLUMN (column)); + g_assert_cmpstr (gtk_tree_view_column_get_title (column), ==, "Test"); renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column)); - g_assert (g_list_length (renderers) == 1); + g_assert_cmpint (g_list_length (renderers), ==, 1); renderer = g_list_nth_data (renderers, 0); - g_assert (renderer); - g_assert (GTK_IS_CELL_RENDERER_TEXT (renderer)); + g_assert_true (GTK_IS_CELL_RENDERER_TEXT (renderer)); g_list_free (renderers); window = gtk_builder_get_object (builder, "window1"); @@ -1129,8 +1114,7 @@ test_icon_view (void) builder = builder_new_from_string (buffer, -1, NULL); iconview = gtk_builder_get_object (builder, "iconview1"); - g_assert (iconview); - g_assert (GTK_IS_ICON_VIEW (iconview)); + g_assert_true (GTK_IS_ICON_VIEW (iconview)); window = gtk_builder_get_object (builder, "window1"); gtk_window_destroy (GTK_WINDOW (window)); @@ -1184,7 +1168,7 @@ test_combo_box (void) builder = builder_new_from_string (buffer, -1, NULL); combobox = gtk_builder_get_object (builder, "combobox1"); - g_assert (combobox); + g_assert_nonnull (combobox); window = gtk_builder_get_object (builder, "window1"); gtk_window_destroy (GTK_WINDOW (window)); @@ -1242,20 +1226,18 @@ test_combo_box_entry (void) builder = builder_new_from_string (buffer, -1, NULL); combobox = gtk_builder_get_object (builder, "comboboxentry1"); - g_assert (combobox); + g_assert_nonnull (combobox); renderer = gtk_builder_get_object (builder, "renderer2"); - g_assert (renderer); + g_assert_nonnull (renderer); g_object_get (renderer, "text", &text, NULL); - g_assert (text); - g_assert (strcmp (text, "Bar") == 0); + g_assert_cmpstr (text, ==, "Bar"); g_free (text); renderer = gtk_builder_get_object (builder, "renderer1"); - g_assert (renderer); + g_assert_nonnull (renderer); g_object_get (renderer, "text", &text, NULL); - g_assert (text); - g_assert (strcmp (text, "2") == 0); + g_assert_cmpstr (text, ==, "2"); g_free (text); window = gtk_builder_get_object (builder, "window1"); @@ -1303,22 +1285,19 @@ test_cell_view (void) builder = builder_new_from_string (buffer, -1, NULL); cellview = gtk_builder_get_object (builder, "cellview1"); - g_assert (builder); - g_assert (cellview); - g_assert (GTK_IS_CELL_VIEW (cellview)); + g_assert_nonnull (builder); + g_assert_true (GTK_IS_CELL_VIEW (cellview)); g_object_get (cellview, "model", &model, NULL); - g_assert (model); - g_assert (GTK_IS_TREE_MODEL (model)); + g_assert_true (GTK_IS_TREE_MODEL (model)); g_object_unref (model); path = gtk_tree_path_new_first (); gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (cellview), path); renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (cellview)); - g_assert (renderers); - g_assert (g_list_length (renderers) == 1); + g_assert_cmpint (g_list_length (renderers), ==, 1); window = gtk_builder_get_object (builder, "window1"); - g_assert (window); + g_assert_nonnull (window); gtk_window_destroy (GTK_WINDOW (window)); g_object_unref (builder); @@ -1361,9 +1340,9 @@ test_dialog (void) builder = builder_new_from_string (buffer1, -1, NULL); dialog1 = gtk_builder_get_object (builder, "dialog1"); button_ok = gtk_builder_get_object (builder, "button_ok"); - g_assert (gtk_dialog_get_response_for_widget (GTK_DIALOG (dialog1), GTK_WIDGET (button_ok)) == 3); + g_assert_cmpint (gtk_dialog_get_response_for_widget (GTK_DIALOG (dialog1), GTK_WIDGET (button_ok)), ==, 3); button_cancel = gtk_builder_get_object (builder, "button_cancel"); - g_assert (gtk_dialog_get_response_for_widget (GTK_DIALOG (dialog1), GTK_WIDGET (button_cancel)) == -5); + g_assert_cmpint (gtk_dialog_get_response_for_widget (GTK_DIALOG (dialog1), GTK_WIDGET (button_cancel)), ==, -5); gtk_window_destroy (GTK_WINDOW (dialog1)); g_object_unref (builder); @@ -1393,8 +1372,8 @@ test_message_dialog (void) builder = builder_new_from_string (buffer1, -1, NULL); dialog1 = gtk_builder_get_object (builder, "dialog1"); expander = gtk_builder_get_object (builder, "expander"); - g_assert (GTK_IS_EXPANDER (expander)); - g_assert (gtk_widget_get_parent (GTK_WIDGET (expander)) == gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog1))); + g_assert_true (GTK_IS_EXPANDER (expander)); + g_assert_true (gtk_widget_get_parent (GTK_WIDGET (expander)) == gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog1))); gtk_window_destroy (GTK_WINDOW (dialog1)); g_object_unref (builder); @@ -1457,7 +1436,7 @@ test_widget (void) builder = builder_new_from_string (buffer, -1, NULL); button1 = gtk_builder_get_object (builder, "button1"); - g_assert (gtk_widget_has_focus (GTK_WIDGET (button1))); + g_assert_true (gtk_widget_has_focus (GTK_WIDGET (button1))); window1 = gtk_builder_get_object (builder, "window1"); gtk_window_destroy (GTK_WINDOW (window1)); @@ -1466,7 +1445,7 @@ test_widget (void) builder = builder_new_from_string (buffer2, -1, NULL); button1 = gtk_builder_get_object (builder, "button1"); - g_assert (gtk_widget_get_receives_default (GTK_WIDGET (button1))); + g_assert_true (gtk_widget_get_receives_default (GTK_WIDGET (button1))); g_object_unref (builder); @@ -1474,14 +1453,14 @@ test_widget (void) window1 = gtk_builder_get_object (builder, "window1"); label1 = gtk_builder_get_object (builder, "label1"); - g_assert (GTK_IS_LABEL (label1)); + g_assert_true (GTK_IS_LABEL (label1)); gtk_window_destroy (GTK_WINDOW (window1)); g_object_unref (builder); builder = builder_new_from_string (buffer4, -1, NULL); label1 = gtk_builder_get_object (builder, "label1"); - g_assert (GTK_IS_LABEL (label1)); + g_assert_true (GTK_IS_LABEL (label1)); g_object_unref (builder); } @@ -1507,7 +1486,7 @@ test_window (void) builder = builder_new_from_string (buffer1, -1, NULL); window1 = gtk_builder_get_object (builder, "window1"); g_object_get (window1, "title", &title, NULL); - g_assert (strcmp (title, "") == 0); + g_assert_cmpstr (title, ==, ""); g_free (title); gtk_window_destroy (GTK_WINDOW (window1)); g_object_unref (builder); @@ -1527,124 +1506,124 @@ test_value_from_string (void) builder = gtk_builder_new (); - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_STRING, "test", &value, &error)); - g_assert (G_VALUE_HOLDS_STRING (&value)); - g_assert (strcmp (g_value_get_string (&value), "test") == 0); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_STRING, "test", &value, &error)); + g_assert_true (G_VALUE_HOLDS_STRING (&value)); + g_assert_cmpstr (g_value_get_string (&value), ==, "test"); g_value_unset (&value); - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "true", &value, &error)); - g_assert (G_VALUE_HOLDS_BOOLEAN (&value)); - g_assert (g_value_get_boolean (&value) == TRUE); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "true", &value, &error)); + g_assert_true (G_VALUE_HOLDS_BOOLEAN (&value)); + g_assert_true (g_value_get_boolean (&value)); g_value_unset (&value); - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "false", &value, &error)); - g_assert (G_VALUE_HOLDS_BOOLEAN (&value)); - g_assert (g_value_get_boolean (&value) == FALSE); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "false", &value, &error)); + g_assert_true (G_VALUE_HOLDS_BOOLEAN (&value)); + g_assert_false (g_value_get_boolean (&value)); g_value_unset (&value); - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "yes", &value, &error)); - g_assert (G_VALUE_HOLDS_BOOLEAN (&value)); - g_assert (g_value_get_boolean (&value) == TRUE); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "yes", &value, &error)); + g_assert_true (G_VALUE_HOLDS_BOOLEAN (&value)); + g_assert_true (g_value_get_boolean (&value)); g_value_unset (&value); - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "no", &value, &error)); - g_assert (G_VALUE_HOLDS_BOOLEAN (&value)); - g_assert (g_value_get_boolean (&value) == FALSE); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "no", &value, &error)); + g_assert_true (G_VALUE_HOLDS_BOOLEAN (&value)); + g_assert_false (g_value_get_boolean (&value)); g_value_unset (&value); - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "0", &value, &error)); - g_assert (G_VALUE_HOLDS_BOOLEAN (&value)); - g_assert (g_value_get_boolean (&value) == FALSE); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "0", &value, &error)); + g_assert_true (G_VALUE_HOLDS_BOOLEAN (&value)); + g_assert_false (g_value_get_boolean (&value)); g_value_unset (&value); - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "1", &value, &error)); - g_assert (G_VALUE_HOLDS_BOOLEAN (&value)); - g_assert (g_value_get_boolean (&value) == TRUE); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "1", &value, &error)); + g_assert_true (G_VALUE_HOLDS_BOOLEAN (&value)); + g_assert_true (g_value_get_boolean (&value)); g_value_unset (&value); - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "tRuE", &value, &error)); - g_assert (G_VALUE_HOLDS_BOOLEAN (&value)); - g_assert (g_value_get_boolean (&value) == TRUE); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "tRuE", &value, &error)); + g_assert_true (G_VALUE_HOLDS_BOOLEAN (&value)); + g_assert_true (g_value_get_boolean (&value)); g_value_unset (&value); - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "blaurgh", &value, &error) == FALSE); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "blaurgh", &value, &error) == FALSE); g_value_unset (&value); g_assert_error (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_INVALID_VALUE); g_error_free (error); error = NULL; - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "yess", &value, &error) == FALSE); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "yess", &value, &error) == FALSE); g_value_unset (&value); g_assert_error (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_INVALID_VALUE); g_error_free (error); error = NULL; - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "trueee", &value, &error) == FALSE); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "trueee", &value, &error) == FALSE); g_value_unset (&value); g_assert_error (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_INVALID_VALUE); g_error_free (error); error = NULL; - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "", &value, &error) == FALSE); + g_assert_false (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, "", &value, &error)); g_value_unset (&value); g_assert_error (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_INVALID_VALUE); g_error_free (error); error = NULL; - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_INT, "12345", &value, &error)); - g_assert (G_VALUE_HOLDS_INT (&value)); - g_assert (g_value_get_int (&value) == 12345); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_INT, "12345", &value, &error)); + g_assert_true (G_VALUE_HOLDS_INT (&value)); + g_assert_cmpint (g_value_get_int (&value), ==, 12345); g_value_unset (&value); - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_LONG, "9912345", &value, &error)); - g_assert (G_VALUE_HOLDS_LONG (&value)); - g_assert (g_value_get_long (&value) == 9912345); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_LONG, "9912345", &value, &error)); + g_assert_true (G_VALUE_HOLDS_LONG (&value)); + g_assert_cmpint (g_value_get_long (&value), ==, 9912345); g_value_unset (&value); - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_UINT, "2345", &value, &error)); - g_assert (G_VALUE_HOLDS_UINT (&value)); - g_assert (g_value_get_uint (&value) == 2345); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_UINT, "2345", &value, &error)); + g_assert_true (G_VALUE_HOLDS_UINT (&value)); + g_assert_cmpint (g_value_get_uint (&value), ==, 2345); g_value_unset (&value); - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_INT64, "-2345", &value, &error)); - g_assert (G_VALUE_HOLDS_INT64 (&value)); - g_assert (g_value_get_int64 (&value) == -2345); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_INT64, "-2345", &value, &error)); + g_assert_true (G_VALUE_HOLDS_INT64 (&value)); + g_assert_cmpint (g_value_get_int64 (&value), ==, -2345); g_value_unset (&value); - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_UINT64, "2345", &value, &error)); - g_assert (G_VALUE_HOLDS_UINT64 (&value)); - g_assert (g_value_get_uint64 (&value) == 2345); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_UINT64, "2345", &value, &error)); + g_assert_true (G_VALUE_HOLDS_UINT64 (&value)); + g_assert_cmpint (g_value_get_uint64 (&value), ==, 2345); g_value_unset (&value); - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_FLOAT, "1.454", &value, &error)); - g_assert (G_VALUE_HOLDS_FLOAT (&value)); - g_assert (fabs (g_value_get_float (&value) - 1.454) < 0.00001); + g_assert_true (gtk_builder_value_from_string_type (builder, G_TYPE_FLOAT, "1.454", &value, &error)); + g_assert_true (G_VALUE_HOLDS_FLOAT (&value)); + g_assert_cmpfloat (fabs (g_value_get_float (&value) - 1.454), <, 0.00001); g_value_unset (&value); - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_FLOAT, "abc", &value, &error) == FALSE); + g_assert_false (gtk_builder_value_from_string_type (builder, G_TYPE_FLOAT, "abc", &value, &error)); g_value_unset (&value); g_assert_error (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_INVALID_VALUE); g_error_free (error); error = NULL; - g_assert (gtk_builder_value_from_string_type (builder, G_TYPE_INT, "/-+,abc", &value, &error) == FALSE); + g_assert_false (gtk_builder_value_from_string_type (builder, G_TYPE_INT, "/-+,abc", &value, &error)); g_value_unset (&value); g_assert_error (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_INVALID_VALUE); g_error_free (error); error = NULL; - g_assert (gtk_builder_value_from_string_type (builder, GTK_TYPE_TEXT_DIRECTION, "rtl", &value, &error) == TRUE); - g_assert (G_VALUE_HOLDS_ENUM (&value)); - g_assert (g_value_get_enum (&value) == GTK_TEXT_DIR_RTL); + g_assert_true (gtk_builder_value_from_string_type (builder, GTK_TYPE_TEXT_DIRECTION, "rtl", &value, &error)); + g_assert_true (G_VALUE_HOLDS_ENUM (&value)); + g_assert_cmpint (g_value_get_enum (&value), ==, GTK_TEXT_DIR_RTL); g_value_unset (&value); - g_assert (gtk_builder_value_from_string_type (builder, GTK_TYPE_TEXT_DIRECTION, "sliff", &value, &error) == FALSE); + g_assert_false (gtk_builder_value_from_string_type (builder, GTK_TYPE_TEXT_DIRECTION, "sliff", &value, &error)); g_value_unset (&value); g_assert_error (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_INVALID_VALUE); g_error_free (error); error = NULL; - g_assert (gtk_builder_value_from_string_type (builder, GTK_TYPE_TEXT_DIRECTION, "foobar", &value, &error) == FALSE); + g_assert_false (gtk_builder_value_from_string_type (builder, GTK_TYPE_TEXT_DIRECTION, "foobar", &value, &error)); g_value_unset (&value); g_assert_error (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_INVALID_VALUE); g_error_free (error); @@ -1697,9 +1676,9 @@ test_reference_counting (void) g_object_weak_ref (model, (GWeakNotify)model_weakref, NULL); - g_assert (model_freed == FALSE); + g_assert_false (model_freed); gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), NULL); - g_assert (model_freed == TRUE); + g_assert_true (model_freed); gtk_window_destroy (GTK_WINDOW (window)); @@ -1785,21 +1764,21 @@ test_pango_attributes (void) /* Test attributes are set */ builder = builder_new_from_string (buffer, -1, NULL); label = gtk_builder_get_object (builder, "label1"); - g_assert (label != NULL); + g_assert_nonnull (label); attrs = gtk_label_get_attributes (GTK_LABEL (label)); - g_assert (attrs != NULL); + g_assert_nonnull (attrs); filtered = pango_attr_list_filter (attrs, filter_pango_attrs, &found); - g_assert (filtered); + g_assert_true (filtered); pango_attr_list_unref (filtered); - g_assert (found.weight); - g_assert (found.foreground); - g_assert (found.underline); - g_assert (found.size); - g_assert (found.language); - g_assert (found.font_desc); + g_assert_true (found.weight); + g_assert_true (found.foreground); + g_assert_true (found.underline); + g_assert_true (found.size); + g_assert_true (found.language); + g_assert_true (found.font_desc); g_object_unref (builder); @@ -1886,25 +1865,25 @@ test_add_objects (void) ret = gtk_builder_add_objects_from_string (builder, buffer, -1, objects, &error); g_assert_no_error (error); obj = gtk_builder_get_object (builder, "window"); - g_assert (obj == NULL); + g_assert_null (obj); obj = gtk_builder_get_object (builder, "window2"); - g_assert (obj == NULL); + g_assert_null (obj); obj = gtk_builder_get_object (builder, "mainbox"); - g_assert (GTK_IS_WIDGET (obj)); + g_assert_true (GTK_IS_WIDGET (obj)); g_object_unref (builder); error = NULL; builder = gtk_builder_new (); ret = gtk_builder_add_objects_from_string (builder, buffer, -1, objects2, &error); - g_assert (ret); - g_assert (error == NULL); + g_assert_true (ret); + g_assert_null (error); obj = gtk_builder_get_object (builder, "window"); - g_assert (obj == NULL); + g_assert_null (obj); obj = gtk_builder_get_object (builder, "window2"); - g_assert (GTK_IS_WINDOW (obj)); + g_assert_true (GTK_IS_WINDOW (obj)); gtk_window_destroy (GTK_WINDOW (obj)); obj = gtk_builder_get_object (builder, "mainbox"); - g_assert (GTK_IS_WIDGET (obj)); + g_assert_true (GTK_IS_WIDGET (obj)); g_object_unref (builder); } @@ -1939,12 +1918,12 @@ test_message_area (void) builder = builder_new_from_string (buffer, -1, NULL); obj = gtk_builder_get_object (builder, "infobar1"); - g_assert (GTK_IS_INFO_BAR (obj)); + g_assert_true (GTK_IS_INFO_BAR (obj)); obj1 = gtk_builder_get_object (builder, "content"); - g_assert (GTK_IS_LABEL (obj1)); + g_assert_true (GTK_IS_LABEL (obj1)); obj1 = gtk_builder_get_object (builder, "button_ok"); - g_assert (GTK_IS_BUTTON (obj1)); + g_assert_true (GTK_IS_BUTTON (obj1)); g_object_unref (builder); } @@ -2014,11 +1993,11 @@ test_gmenu (void) builder = builder_new_from_string (buffer, -1, NULL); obj = gtk_builder_get_object (builder, "window"); - g_assert (GTK_IS_WINDOW (obj)); + g_assert_true (GTK_IS_WINDOW (obj)); obj1 = gtk_builder_get_object (builder, "edit-menu"); - g_assert (G_IS_MENU_MODEL (obj1)); + g_assert_true (G_IS_MENU_MODEL (obj1)); obj1 = gtk_builder_get_object (builder, "blargh"); - g_assert (G_IS_MENU_MODEL (obj1)); + g_assert_true (G_IS_MENU_MODEL (obj1)); g_object_unref (builder); } @@ -2066,12 +2045,12 @@ test_level_bar (void) builder = gtk_builder_new (); gtk_builder_add_from_string (builder, buffer1, -1, &error); - g_assert (error == NULL); + g_assert_true (error == NULL); obj = gtk_builder_get_object (builder, "window"); - g_assert (GTK_IS_WINDOW (obj)); + g_assert_true (GTK_IS_WINDOW (obj)); obj1 = gtk_builder_get_object (builder, "levelbar"); - g_assert (GTK_IS_LEVEL_BAR (obj1)); + g_assert_true (GTK_IS_LEVEL_BAR (obj1)); g_object_unref (builder); error = NULL; @@ -2111,9 +2090,9 @@ test_expose_object (void) g_assert_no_error (error); obj = gtk_builder_get_object (builder, "button"); - g_assert (GTK_IS_MENU_BUTTON (obj)); + g_assert_true (GTK_IS_MENU_BUTTON (obj)); - g_assert (gtk_menu_button_get_popover (GTK_MENU_BUTTON (obj)) == GTK_POPOVER (menu)); + g_assert_true (gtk_menu_button_get_popover (GTK_MENU_BUTTON (obj)) == GTK_POPOVER (menu)); g_object_unref (menu); g_object_unref (builder); @@ -2151,10 +2130,10 @@ test_no_ids (void) builder = gtk_builder_new (); gtk_builder_add_from_string (builder, buffer, -1, &error); - g_assert (error == NULL); + g_assert_null (error); obj = gtk_builder_get_object (builder, "button_ok"); - g_assert (GTK_IS_BUTTON (obj)); + g_assert_true (GTK_IS_BUTTON (obj)); g_object_unref (builder); } @@ -2200,25 +2179,25 @@ test_property_bindings (void) builder = builder_new_from_string (buffer, -1, NULL); checkbutton = gtk_builder_get_object (builder, "checkbutton"); - g_assert (GTK_IS_CHECK_BUTTON (checkbutton)); - g_assert (!gtk_check_button_get_active (GTK_CHECK_BUTTON (checkbutton))); + g_assert_true (GTK_IS_CHECK_BUTTON (checkbutton)); + g_assert_true (!gtk_check_button_get_active (GTK_CHECK_BUTTON (checkbutton))); button = gtk_builder_get_object (builder, "button"); - g_assert (GTK_IS_BUTTON (button)); - g_assert (!gtk_widget_get_sensitive (GTK_WIDGET (button))); + g_assert_true (GTK_IS_BUTTON (button)); + g_assert_false (gtk_widget_get_sensitive (GTK_WIDGET (button))); button2 = gtk_builder_get_object (builder, "button2"); - g_assert (GTK_IS_BUTTON (button2)); - g_assert (gtk_widget_get_sensitive (GTK_WIDGET (button2))); + g_assert_true (GTK_IS_BUTTON (button2)); + g_assert_true (gtk_widget_get_sensitive (GTK_WIDGET (button2))); button3 = gtk_builder_get_object (builder, "button3"); - g_assert (GTK_IS_BUTTON (button3)); - g_assert (!gtk_widget_get_sensitive (GTK_WIDGET (button3))); + g_assert_true (GTK_IS_BUTTON (button3)); + g_assert_false (gtk_widget_get_sensitive (GTK_WIDGET (button3))); gtk_check_button_set_active (GTK_CHECK_BUTTON (checkbutton), TRUE); - g_assert (gtk_widget_get_sensitive (GTK_WIDGET (button))); - g_assert (gtk_widget_get_sensitive (GTK_WIDGET (button2))); - g_assert (gtk_widget_get_sensitive (GTK_WIDGET (button3))); + g_assert_true (gtk_widget_get_sensitive (GTK_WIDGET (button))); + g_assert_true (gtk_widget_get_sensitive (GTK_WIDGET (button2))); + g_assert_true (gtk_widget_get_sensitive (GTK_WIDGET (button3))); window = gtk_builder_get_object (builder, "window"); gtk_window_destroy (GTK_WINDOW (window)); @@ -2283,17 +2262,17 @@ test_template (void) MyGtkGrid *my_gtk_grid; /* make sure the type we are trying to register does not exist */ - g_assert (!g_type_from_name ("MyGtkGrid")); + g_assert_false (g_type_from_name ("MyGtkGrid")); /* create the template object */ my_gtk_grid = g_object_new (MY_TYPE_GTK_GRID, NULL); /* Check everything is fine */ - g_assert (g_type_from_name ("MyGtkGrid")); - g_assert (MY_IS_GTK_GRID (my_gtk_grid)); - g_assert (my_gtk_grid->label == my_gtk_grid->priv->label); - g_assert (GTK_IS_LABEL (my_gtk_grid->label)); - g_assert (GTK_IS_LABEL (my_gtk_grid->priv->label)); + g_assert_true (g_type_from_name ("MyGtkGrid")); + g_assert_true (MY_IS_GTK_GRID (my_gtk_grid)); + g_assert_true (my_gtk_grid->label == my_gtk_grid->priv->label); + g_assert_true (GTK_IS_LABEL (my_gtk_grid->label)); + g_assert_true (GTK_IS_LABEL (my_gtk_grid->priv->label)); } _BUILDER_TEST_EXPORT void @@ -2370,7 +2349,7 @@ test_file_filter (void) builder = builder_new_from_string (buffer, -1, NULL); obj = gtk_builder_get_object (builder, "filter1"); - g_assert (GTK_IS_FILE_FILTER (obj)); + g_assert_true (GTK_IS_FILE_FILTER (obj)); filter = GTK_FILE_FILTER (obj); g_assert_cmpstr (gtk_file_filter_get_name (filter), ==, "Text and Images"); g_assert_true (g_strv_contains (gtk_file_filter_get_attributes (filter), G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE)); @@ -2404,7 +2383,7 @@ test_shortcuts (void) builder = builder_new_from_string (buffer, -1, NULL); obj = gtk_builder_get_object (builder, "controller"); - g_assert (GTK_IS_SHORTCUT_CONTROLLER (obj)); + g_assert_true (GTK_IS_SHORTCUT_CONTROLLER (obj)); g_object_unref (builder); } @@ -2436,13 +2415,13 @@ test_transforms (void) builder = builder_new_from_string (buffer1, -1, NULL); vbox = gtk_builder_get_object (builder, "fixed1"); - g_assert (GTK_IS_FIXED (vbox)); + g_assert_true (GTK_IS_FIXED (vbox)); label = gtk_builder_get_object (builder, "label1"); - g_assert (GTK_IS_LABEL (label)); + g_assert_true (GTK_IS_LABEL (label)); label = gtk_builder_get_object (builder, "label2"); - g_assert (GTK_IS_LABEL (label)); + g_assert_true (GTK_IS_LABEL (label)); g_object_unref (builder); } @@ -2498,8 +2477,8 @@ test_expressions (void) { builder = builder_new_from_string (tests[i], -1, NULL); obj = gtk_builder_get_object (builder, "filter"); - g_assert (GTK_IS_FILTER (obj)); - g_assert (gtk_filter_match (GTK_FILTER (obj), obj)); + g_assert_true (GTK_IS_FILTER (obj)); + g_assert_true (gtk_filter_match (GTK_FILTER (obj), obj)); g_object_unref (builder); } diff --git a/testsuite/gtk/cellarea.c b/testsuite/gtk/cellarea.c index 1319ad5fb1..83995cbda2 100644 --- a/testsuite/gtk/cellarea.c +++ b/testsuite/gtk/cellarea.c @@ -36,8 +36,8 @@ test_iconview_new (void) view = gtk_icon_view_new (); area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (view)); - g_assert (GTK_IS_CELL_AREA_BOX (area)); - g_assert (gtk_orientable_get_orientation (GTK_ORIENTABLE (area)) == gtk_icon_view_get_item_orientation (GTK_ICON_VIEW (view))); + g_assert_true (GTK_IS_CELL_AREA_BOX (area)); + g_assert_true (gtk_orientable_get_orientation (GTK_ORIENTABLE (area)) == gtk_icon_view_get_item_orientation (GTK_ICON_VIEW (view))); g_object_ref_sink (view); g_object_unref (view); @@ -52,7 +52,7 @@ test_iconview_new_with_area (void) area = gtk_cell_area_box_new (); view = gtk_icon_view_new_with_area (area); - g_assert (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (view)) == area); + g_assert_true (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (view)) == area); g_object_ref_sink (view); g_object_unref (view); @@ -68,8 +68,8 @@ test_iconview_object_new (void) area = gtk_cell_area_box_new (); gtk_orientable_set_orientation (GTK_ORIENTABLE (area), GTK_ORIENTATION_HORIZONTAL); view = g_object_new (GTK_TYPE_ICON_VIEW, "cell-area", area, NULL); - g_assert (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (view)) == area); - g_assert (gtk_orientable_get_orientation (GTK_ORIENTABLE (area)) == gtk_icon_view_get_item_orientation (GTK_ICON_VIEW (view))); + g_assert_true (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (view)) == area); + g_assert_true (gtk_orientable_get_orientation (GTK_ORIENTABLE (area)) == gtk_icon_view_get_item_orientation (GTK_ICON_VIEW (view))); g_object_ref_sink (view); g_object_unref (view); @@ -85,7 +85,7 @@ test_combobox_new (void) view = gtk_combo_box_new (); area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (view)); - g_assert (GTK_IS_CELL_AREA_BOX (area)); + g_assert_true (GTK_IS_CELL_AREA_BOX (area)); g_object_ref_sink (view); g_object_unref (view); @@ -117,8 +117,8 @@ my_combo_box_init (MyComboBox *view) else if (subclass_init == 1) { area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (view)); - g_assert (GTK_IS_CELL_AREA_BOX (area)); - g_assert (gtk_orientable_get_orientation (GTK_ORIENTABLE (area)) == GTK_ORIENTATION_HORIZONTAL); + g_assert_true (GTK_IS_CELL_AREA_BOX (area)); + g_assert_cmpint (gtk_orientable_get_orientation (GTK_ORIENTABLE (area)), ==, GTK_ORIENTATION_HORIZONTAL); gtk_orientable_set_orientation (GTK_ORIENTABLE (area), GTK_ORIENTATION_VERTICAL); } } @@ -134,8 +134,8 @@ test_combobox_subclass0 (void) view = g_object_new (my_combo_box_get_type (), NULL); area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (view)); - g_assert (GTK_IS_CELL_AREA_BOX (area)); - g_assert (gtk_orientable_get_orientation (GTK_ORIENTABLE (area)) == GTK_ORIENTATION_HORIZONTAL); + g_assert_true (GTK_IS_CELL_AREA_BOX (area)); + g_assert_cmpint (gtk_orientable_get_orientation (GTK_ORIENTABLE (area)), ==, GTK_ORIENTATION_HORIZONTAL); g_object_ref_sink (view); g_object_unref (view); @@ -152,8 +152,8 @@ test_combobox_subclass2 (void) view = g_object_new (my_combo_box_get_type (), NULL); area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (view)); - g_assert (GTK_IS_CELL_AREA_BOX (area)); - g_assert (gtk_orientable_get_orientation (GTK_ORIENTABLE (area)) == GTK_ORIENTATION_VERTICAL); + g_assert_true (GTK_IS_CELL_AREA_BOX (area)); + g_assert_cmpint (gtk_orientable_get_orientation (GTK_ORIENTABLE (area)), ==, GTK_ORIENTATION_VERTICAL); g_object_ref_sink (view); g_object_unref (view); @@ -169,7 +169,7 @@ test_cellview_new (void) view = gtk_cell_view_new (); area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (view)); - g_assert (GTK_IS_CELL_AREA_BOX (area)); + g_assert_true (GTK_IS_CELL_AREA_BOX (area)); g_object_ref_sink (view); g_object_unref (view); @@ -186,7 +186,7 @@ test_cellview_new_with_context (void) area = gtk_cell_area_box_new (); context = gtk_cell_area_create_context (area); view = gtk_cell_view_new_with_context (area, context); - g_assert (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (view)) == area); + g_assert_true (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (view)) == area); g_object_ref_sink (view); g_object_unref (view); @@ -202,7 +202,7 @@ test_cellview_object_new (void) area = gtk_cell_area_box_new (); gtk_orientable_set_orientation (GTK_ORIENTABLE (area), GTK_ORIENTATION_HORIZONTAL); view = g_object_new (GTK_TYPE_CELL_VIEW, "cell-area", area, NULL); - g_assert (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (view)) == area); + g_assert_true (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (view)) == area); g_object_ref_sink (view); g_object_unref (view); @@ -218,7 +218,7 @@ test_column_new (void) col = gtk_tree_view_column_new (); area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (col)); - g_assert (GTK_IS_CELL_AREA_BOX (area)); + g_assert_true (GTK_IS_CELL_AREA_BOX (area)); g_object_ref_sink (col); g_object_unref (col); @@ -233,7 +233,7 @@ test_column_new_with_area (void) area = gtk_cell_area_box_new (); col = gtk_tree_view_column_new_with_area (area); - g_assert (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (col)) == area); + g_assert_true (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (col)) == area); g_object_ref_sink (col); g_object_unref (col); @@ -249,7 +249,7 @@ test_column_object_new (void) area = gtk_cell_area_box_new (); gtk_orientable_set_orientation (GTK_ORIENTABLE (area), GTK_ORIENTATION_HORIZONTAL); col = g_object_new (GTK_TYPE_TREE_VIEW_COLUMN, "cell-area", area, NULL); - g_assert (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (col)) == area); + g_assert_true (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (col)) == area); g_object_ref_sink (col); g_object_unref (col); @@ -265,7 +265,7 @@ test_completion_new (void) c = gtk_entry_completion_new (); area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (c)); - g_assert (GTK_IS_CELL_AREA_BOX (area)); + g_assert_true (GTK_IS_CELL_AREA_BOX (area)); g_object_ref_sink (c); g_object_unref (c); @@ -280,7 +280,7 @@ test_completion_new_with_area (void) area = gtk_cell_area_box_new (); c = gtk_entry_completion_new_with_area (area); - g_assert (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (c)) == area); + g_assert_true (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (c)) == area); g_object_ref_sink (c); g_object_unref (c); @@ -296,7 +296,7 @@ test_completion_object_new (void) area = gtk_cell_area_box_new (); gtk_orientable_set_orientation (GTK_ORIENTABLE (area), GTK_ORIENTATION_HORIZONTAL); c = g_object_new (GTK_TYPE_ENTRY_COMPLETION, "cell-area", area, NULL); - g_assert (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (c)) == area); + g_assert_true (gtk_cell_layout_get_area (GTK_CELL_LAYOUT (c)) == area); g_object_ref_sink (c); g_object_unref (c); diff --git a/testsuite/gtk/constraint-solver.c b/testsuite/gtk/constraint-solver.c index 970cf8df54..53f4905d39 100644 --- a/testsuite/gtk/constraint-solver.c +++ b/testsuite/gtk/constraint-solver.c @@ -363,7 +363,7 @@ constraint_solver_paper (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); g_test_add_func ("/constraint-solver/paper", constraint_solver_paper); diff --git a/testsuite/gtk/cssprovider.c b/testsuite/gtk/cssprovider.c index 3e0ba7c372..500dfce916 100644 --- a/testsuite/gtk/cssprovider.c +++ b/testsuite/gtk/cssprovider.c @@ -6,7 +6,7 @@ assert_section_is_not_null (GtkCssProvider *provider, const GError *error, gpointer unused) { - g_assert (section != NULL); + g_assert_nonnull (section); } static void @@ -37,7 +37,7 @@ int main (int argc, char *argv[]) { gtk_init (); - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); g_test_add_func ("/cssprovider/section-in-load-from-data", test_section_in_load_from_data); g_test_add_func ("/cssprovider/load-nonexisting-file", test_section_load_nonexisting_file); diff --git a/testsuite/gtk/displayclose.c b/testsuite/gtk/displayclose.c index e274995cf2..3cef035d33 100644 --- a/testsuite/gtk/displayclose.c +++ b/testsuite/gtk/displayclose.c @@ -14,7 +14,7 @@ main (int argc, char **argv) display_name = g_getenv ("DISPLAY"); g_unsetenv ("DISPLAY"); has_display = gtk_init_check (); - g_assert (!has_display); + g_assert_false (has_display); display = gdk_display_open (display_name); diff --git a/testsuite/gtk/expression.c b/testsuite/gtk/expression.c index cea66f3ae9..d18e46c1e4 100644 --- a/testsuite/gtk/expression.c +++ b/testsuite/gtk/expression.c @@ -37,12 +37,14 @@ test_property (void) GtkExpressionWatch *watch; GtkStringFilter *filter; guint counter = 0; + gboolean ret; filter = gtk_string_filter_new (NULL); expr = gtk_property_expression_new (GTK_TYPE_STRING_FILTER, NULL, "search"); watch = gtk_expression_watch (expr, filter, inc_counter, &counter, NULL); - g_assert (gtk_expression_evaluate (expr, filter, &value)); + ret = gtk_expression_evaluate (expr, filter, &value); + g_assert_true (ret); g_assert_cmpstr (g_value_get_string (&value), ==, NULL); g_value_unset (&value); @@ -50,7 +52,8 @@ test_property (void) g_assert_cmpint (counter, ==, 1); counter = 0; - g_assert (gtk_expression_evaluate (expr, filter , &value)); + ret = gtk_expression_evaluate (expr, filter , &value); + g_assert_true (ret); g_assert_cmpstr (g_value_get_string (&value), ==, "Hello World"); g_value_unset (&value); @@ -92,6 +95,7 @@ test_cclosure (void) GtkExpressionWatch *watch; GtkStringFilter *filter; guint counter = 0; + gboolean ret; filter = GTK_STRING_FILTER (gtk_string_filter_new (NULL)); pexpr[0] = gtk_property_expression_new (GTK_TYPE_STRING_FILTER, NULL, "search"); @@ -106,19 +110,22 @@ test_cclosure (void) NULL); watch = gtk_expression_watch (expr, filter, inc_counter, &counter, NULL); - g_assert (gtk_expression_evaluate (expr, filter, &value)); + ret = gtk_expression_evaluate (expr, filter, &value); + g_assert_true (ret); g_assert_cmpstr (g_value_get_string (&value), ==, "OK"); g_value_unset (&value); gtk_string_filter_set_search (filter, "Hello World"); g_assert_cmpint (counter, ==, 1); - g_assert (gtk_expression_evaluate (expr, filter , &value)); + ret = gtk_expression_evaluate (expr, filter , &value); + g_assert_true (ret); g_assert_cmpstr (g_value_get_string (&value), ==, "OK"); g_value_unset (&value); gtk_string_filter_set_ignore_case (filter, FALSE); g_assert_cmpint (counter, ==, 2); - g_assert (gtk_expression_evaluate (expr, filter , &value)); + ret = gtk_expression_evaluate (expr, filter , &value); + g_assert_true (ret); g_assert_cmpstr (g_value_get_string (&value), ==, "OK"); g_value_unset (&value); @@ -126,7 +133,8 @@ test_cclosure (void) gtk_string_filter_set_ignore_case (filter, TRUE); gtk_string_filter_set_match_mode (filter, GTK_STRING_FILTER_MATCH_MODE_EXACT); g_assert_cmpint (counter, ==, 5); - g_assert (gtk_expression_evaluate (expr, filter , &value)); + ret = gtk_expression_evaluate (expr, filter , &value); + g_assert_true (ret); g_assert_cmpstr (g_value_get_string (&value), ==, "OK"); g_value_unset (&value); @@ -149,10 +157,12 @@ test_closure (void) GValue value = G_VALUE_INIT; GtkExpression *expr; GClosure *closure; + gboolean ret; closure = g_cclosure_new (G_CALLBACK (make_string), NULL, NULL); expr = gtk_closure_expression_new (G_TYPE_STRING, closure, 0, NULL); - g_assert (gtk_expression_evaluate (expr, NULL, &value)); + ret = gtk_expression_evaluate (expr, NULL, &value); + g_assert_true (ret); g_assert_cmpstr (g_value_get_string (&value), ==, "Hello"); g_value_unset (&value); @@ -585,7 +595,7 @@ test_nested_bind (void) /* check that the expressions evaluate correctly */ res = gtk_expression_evaluate (filter_expr, NULL, &value); g_assert_true (res); - g_assert (g_value_get_object (&value) == filter3); + g_assert_true (g_value_get_object (&value) == filter3); g_value_unset (&value); res = gtk_expression_evaluate (expr, NULL, &value); diff --git a/testsuite/gtk/filter.c b/testsuite/gtk/filter.c index d6fb3fdb0e..07a7bf8e13 100644 --- a/testsuite/gtk/filter.c +++ b/testsuite/gtk/filter.c @@ -29,7 +29,7 @@ get (GListModel *model, { GObject *object = g_list_model_get_item (model, position); guint ret; - g_assert (object != NULL); + g_assert_nonnull (object); ret = GPOINTER_TO_UINT (g_object_get_qdata (object, number_quark)); g_object_unref (object); return ret; @@ -50,7 +50,7 @@ append_digit (GString *s, if (digit == 0) return; - g_assert (digit < 10); + g_assert_cmpint (digit, <, 10); if (s->len) g_string_append_c (s, ' '); @@ -97,7 +97,7 @@ get_spelled_out (gpointer object) guint n = GPOINTER_TO_UINT (g_object_get_qdata (object, number_quark)); GString *s; - g_assert (n < 1000000); + g_assert_cmpint (n, <, 1000000); if (n == 0) return g_strdup ("Zero"); @@ -147,7 +147,7 @@ add (GListStore *store, GObject *object; /* 0 cannot be differentiated from NULL, so don't use it */ - g_assert (number != 0); + g_assert_cmpint (number, !=, 0); object = g_object_new (G_TYPE_OBJECT, NULL); g_object_set_qdata (object, number_quark, GUINT_TO_POINTER (number)); @@ -396,7 +396,7 @@ test_every_dispose (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); number_quark = g_quark_from_static_string ("Hell and fire was spawned to be released."); diff --git a/testsuite/gtk/filterlistmodel-exhaustive.c b/testsuite/gtk/filterlistmodel-exhaustive.c index 30c01c07a6..b7366f4fb6 100644 --- a/testsuite/gtk/filterlistmodel-exhaustive.c +++ b/testsuite/gtk/filterlistmodel-exhaustive.c @@ -467,7 +467,7 @@ add_test_for_all_models (const char *name, int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); add_test_for_all_models ("no-filter", test_no_filter); diff --git a/testsuite/gtk/filterlistmodel.c b/testsuite/gtk/filterlistmodel.c index 331e63981c..fbcae6b3ad 100644 --- a/testsuite/gtk/filterlistmodel.c +++ b/testsuite/gtk/filterlistmodel.c @@ -30,7 +30,7 @@ get (GListModel *model, { GObject *object = g_list_model_get_item (model, position); guint number; - g_assert (object != NULL); + g_assert_nonnull (object); number = GPOINTER_TO_UINT (g_object_get_qdata (object, number_quark)); g_object_unref (object); return number; @@ -64,7 +64,7 @@ add (GListStore *store, GObject *object; /* 0 cannot be differentiated from NULL, so don't use it */ - g_assert (number != 0); + g_assert_cmpint (number, !=, 0); object = g_object_new (G_TYPE_OBJECT, NULL); g_object_set_qdata (object, number_quark, GUINT_TO_POINTER (number)); @@ -120,7 +120,7 @@ items_changed (GListModel *model, guint added, GString *changes) { - g_assert (removed != 0 || added != 0); + g_assert_true (removed != 0 || added != 0); if (changes->len) g_string_append (changes, ", "); @@ -379,7 +379,7 @@ test_incremental (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); number_quark = g_quark_from_static_string ("Hell and fire was spawned to be released."); diff --git a/testsuite/gtk/filtermodel.c b/testsuite/gtk/filtermodel.c index 2bf39ab0f3..974b81339b 100644 --- a/testsuite/gtk/filtermodel.c +++ b/testsuite/gtk/filtermodel.c @@ -6799,8 +6799,8 @@ test_row_changed (void) gtk_list_store_set (store, &iter2, 0, 1, -1); gtk_list_store_set (store, &iter3, 0, 1, -1); - g_assert (row_changed_count == 3); - g_assert (filter_row_changed_count == 0); + g_assert_cmpint (row_changed_count, ==, 3); + g_assert_cmpint (filter_row_changed_count, ==, 0); row_changed_count = 0; filter_row_changed_count = 0; @@ -6813,8 +6813,8 @@ test_row_changed (void) gtk_list_store_set (store, &iter2, 0, 2, -1); gtk_list_store_set (store, &iter3, 0, 2, -1); - g_assert (row_changed_count == 3); - g_assert (filter_row_changed_count == 3); + g_assert_cmpint (row_changed_count, ==, 3); + g_assert_cmpint (filter_row_changed_count, ==, 3); gtk_tree_model_unref_node (filter, &fiter1); gtk_tree_model_unref_node (filter, &fiter2); diff --git a/testsuite/gtk/flattenlistmodel.c b/testsuite/gtk/flattenlistmodel.c index 3d71a27ecc..9144eac64a 100644 --- a/testsuite/gtk/flattenlistmodel.c +++ b/testsuite/gtk/flattenlistmodel.c @@ -30,7 +30,7 @@ get (GListModel *model, { GObject *object = g_list_model_get_item (model, position); guint number; - g_assert (object != NULL); + g_assert_nonnull (object); number = GPOINTER_TO_UINT (g_object_get_qdata (object, number_quark)); g_object_unref (object); return number; @@ -70,7 +70,7 @@ splice (GListStore *store, for (i = 0; i < added; i++) { /* 0 cannot be differentiated from NULL, so don't use it */ - g_assert (numbers[i] != 0); + g_assert_cmpint (numbers[i], !=, 0); objects[i] = g_object_new (G_TYPE_OBJECT, NULL); g_object_set_qdata (objects[i], number_quark, GUINT_TO_POINTER (numbers[i])); } @@ -89,7 +89,7 @@ insert (GListStore *store, GObject *object; /* 0 cannot be differentiated from NULL, so don't use it */ - g_assert (number != 0); + g_assert_cmpint (number, !=, 0); object = g_object_new (G_TYPE_OBJECT, NULL); g_object_set_qdata (object, number_quark, GUINT_TO_POINTER (number)); @@ -104,7 +104,7 @@ add (GListStore *store, GObject *object; /* 0 cannot be differentiated from NULL, so don't use it */ - g_assert (number != 0); + g_assert_cmpint (number, !=, 0); object = g_object_new (G_TYPE_OBJECT, NULL); g_object_set_qdata (object, number_quark, GUINT_TO_POINTER (number)); @@ -170,7 +170,7 @@ items_changed (GListModel *model, guint added, GString *changes) { - g_assert (removed != 0 || added != 0); + g_assert_true (removed != 0 || added != 0); if (changes->len) g_string_append (changes, ", "); @@ -397,7 +397,7 @@ test_submodel_remove (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); number_quark = g_quark_from_static_string ("Hell and fire was spawned to be released."); diff --git a/testsuite/gtk/floating.c b/testsuite/gtk/floating.c index 89add67f49..08f2d7b01b 100644 --- a/testsuite/gtk/floating.c +++ b/testsuite/gtk/floating.c @@ -29,20 +29,20 @@ floating_tests (void) GtkWidget *widget = g_object_new (GTK_TYPE_LABEL, NULL); g_object_connect (widget, "signal::destroy", destroy, NULL, NULL); - g_assert (g_object_is_floating (widget)); + g_assert_true (g_object_is_floating (widget)); g_object_ref_sink (widget); - g_assert (!g_object_is_floating (widget)); + g_assert_false (g_object_is_floating (widget)); g_object_force_floating (G_OBJECT (widget)); - g_assert (g_object_is_floating (widget)); + g_assert_true (g_object_is_floating (widget)); g_object_ref_sink (widget); - g_assert (!g_object_is_floating (widget)); + g_assert_false (g_object_is_floating (widget)); - g_assert (!destroyed); + g_assert_false (destroyed); g_object_unref (widget); - g_assert (destroyed); + g_assert_true (destroyed); } int diff --git a/testsuite/gtk/gtktreemodelrefcount.c b/testsuite/gtk/gtktreemodelrefcount.c index 27b77eb92f..223d8a0d94 100644 --- a/testsuite/gtk/gtktreemodelrefcount.c +++ b/testsuite/gtk/gtktreemodelrefcount.c @@ -163,8 +163,8 @@ gtk_tree_model_ref_count_unref_node (GtkTreeModel *model, GtkTreeModelRefCount *ref_model = GTK_TREE_MODEL_REF_COUNT (model); info = g_hash_table_lookup (ref_model->priv->node_hash, iter->user_data); - g_assert (info != NULL); - g_assert (info->ref_count > 0); + g_assert_nonnull (info); + g_assert_cmpint (info->ref_count, >, 0); info->ref_count--; } @@ -238,7 +238,7 @@ check_iter (GtkTreeModelRefCount *ref_model, NodeInfo *info; if (may_assert) - g_assert (gtk_tree_store_iter_is_valid (GTK_TREE_STORE (ref_model), iter)); + g_assert_true (gtk_tree_store_iter_is_valid (GTK_TREE_STORE (ref_model), iter)); info = g_hash_table_lookup (ref_model->priv->node_hash, iter->user_data); if (!info) diff --git a/testsuite/gtk/icontheme.c b/testsuite/gtk/icontheme.c index 4859edf39c..b32f83bb4d 100644 --- a/testsuite/gtk/icontheme.c +++ b/testsuite/gtk/icontheme.c @@ -99,7 +99,7 @@ assert_icon_lookup_size (const char *icon_name, } else { - g_assert (path == NULL); + g_assert_null (path); } g_free (path); @@ -131,7 +131,7 @@ assert_icon_lookup_fails (const char *icon_name, info = gtk_icon_theme_lookup_icon (get_test_icontheme (FALSE), icon_name, NULL, size, 1, direction, flags); /* We never truly *fail*, but check that we got the image-missing fallback */ - g_assert (info != NULL); + g_assert_nonnull (info); g_assert_cmpstr (gtk_icon_paintable_get_icon_name (info), ==, "image-missing"); } @@ -192,7 +192,7 @@ assert_lookup_order (const char *icon_name, gtk_set_debug_flags (debug_flags | GTK_DEBUG_ICONTHEME); g_log_set_writer_func (log_writer, NULL, NULL); - g_assert (lookups == NULL); + g_assert_null (lookups); if (fallbacks) { @@ -214,12 +214,12 @@ assert_lookup_order (const char *icon_name, l = lookups; while (s != NULL) { - g_assert (l != NULL); + g_assert_nonnull (l); g_assert_cmpstr (s, ==, l->data); s = va_arg (args, char *); l = l->next; } - g_assert (l == NULL); + g_assert_null (l); va_end (args); g_list_free_full (lookups, g_free); @@ -661,31 +661,31 @@ test_list (void) theme = get_test_icontheme (TRUE); icons = gtk_icon_theme_get_icon_names (theme); - g_assert (g_strv_contains ((const char * const *)icons, "size-test")); - g_assert (g_strv_contains ((const char * const *)icons, "simple")); - g_assert (g_strv_contains ((const char * const *)icons, "twosize-fixed")); - g_assert (g_strv_contains ((const char * const *)icons, "twosize")); - g_assert (g_strv_contains ((const char * const *)icons, "only32-symbolic")); - g_assert (g_strv_contains ((const char * const *)icons, "everything")); - g_assert (g_strv_contains ((const char * const *)icons, "everything-rtl")); - g_assert (g_strv_contains ((const char * const *)icons, "everything-symbolic")); - g_assert (g_strv_contains ((const char * const *)icons, "everything-justregular")); - g_assert (g_strv_contains ((const char * const *)icons, "everything-justrtl-rtl")); - g_assert (g_strv_contains ((const char * const *)icons, "everything-symbolic-rtl")); - g_assert (g_strv_contains ((const char * const *)icons, "everything-justsymbolic-symbolic")); - - g_assert (gtk_icon_theme_has_icon (theme, "size-test")); - g_assert (gtk_icon_theme_has_icon (theme, "simple")); - g_assert (gtk_icon_theme_has_icon (theme, "twosize-fixed")); - g_assert (gtk_icon_theme_has_icon (theme, "twosize")); - g_assert (gtk_icon_theme_has_icon (theme, "only32-symbolic")); - g_assert (gtk_icon_theme_has_icon (theme, "everything")); - g_assert (gtk_icon_theme_has_icon (theme, "everything-rtl")); - g_assert (gtk_icon_theme_has_icon (theme, "everything-symbolic")); - g_assert (gtk_icon_theme_has_icon (theme, "everything-justregular")); - g_assert (gtk_icon_theme_has_icon (theme, "everything-justrtl-rtl")); - g_assert (gtk_icon_theme_has_icon (theme, "everything-symbolic-rtl")); - g_assert (gtk_icon_theme_has_icon (theme, "everything-justsymbolic-symbolic")); + g_assert_true (g_strv_contains ((const char * const *)icons, "size-test")); + g_assert_true (g_strv_contains ((const char * const *)icons, "simple")); + g_assert_true (g_strv_contains ((const char * const *)icons, "twosize-fixed")); + g_assert_true (g_strv_contains ((const char * const *)icons, "twosize")); + g_assert_true (g_strv_contains ((const char * const *)icons, "only32-symbolic")); + g_assert_true (g_strv_contains ((const char * const *)icons, "everything")); + g_assert_true (g_strv_contains ((const char * const *)icons, "everything-rtl")); + g_assert_true (g_strv_contains ((const char * const *)icons, "everything-symbolic")); + g_assert_true (g_strv_contains ((const char * const *)icons, "everything-justregular")); + g_assert_true (g_strv_contains ((const char * const *)icons, "everything-justrtl-rtl")); + g_assert_true (g_strv_contains ((const char * const *)icons, "everything-symbolic-rtl")); + g_assert_true (g_strv_contains ((const char * const *)icons, "everything-justsymbolic-symbolic")); + + g_assert_true (gtk_icon_theme_has_icon (theme, "size-test")); + g_assert_true (gtk_icon_theme_has_icon (theme, "simple")); + g_assert_true (gtk_icon_theme_has_icon (theme, "twosize-fixed")); + g_assert_true (gtk_icon_theme_has_icon (theme, "twosize")); + g_assert_true (gtk_icon_theme_has_icon (theme, "only32-symbolic")); + g_assert_true (gtk_icon_theme_has_icon (theme, "everything")); + g_assert_true (gtk_icon_theme_has_icon (theme, "everything-rtl")); + g_assert_true (gtk_icon_theme_has_icon (theme, "everything-symbolic")); + g_assert_true (gtk_icon_theme_has_icon (theme, "everything-justregular")); + g_assert_true (gtk_icon_theme_has_icon (theme, "everything-justrtl-rtl")); + g_assert_true (gtk_icon_theme_has_icon (theme, "everything-symbolic-rtl")); + g_assert_true (gtk_icon_theme_has_icon (theme, "everything-justsymbolic-symbolic")); g_strfreev (icons); } @@ -779,8 +779,8 @@ test_nonsquare_symbolic (void) /* the original dimensions have been preserved */ gsk_render_node_get_bounds (node, &bounds); - g_assert (bounds.size.width == width); - g_assert (bounds.size.height == height); + g_assert_cmpint (bounds.size.width, ==, width); + g_assert_cmpint (bounds.size.height, ==, height); gsk_render_node_unref (node); g_free (path); diff --git a/testsuite/gtk/listbox.c b/testsuite/gtk/listbox.c index 815cf4b031..fea62ba599 100644 --- a/testsuite/gtk/listbox.c +++ b/testsuite/gtk/listbox.c @@ -119,7 +119,7 @@ test_selection (void) gtk_widget_show (GTK_WIDGET (list)); g_assert_cmpint (gtk_list_box_get_selection_mode (list), ==, GTK_SELECTION_SINGLE); - g_assert (gtk_list_box_get_selected_row (list) == NULL); + g_assert_null (gtk_list_box_get_selected_row (list)); for (i = 0; i < 100; i++) { @@ -136,39 +136,39 @@ test_selection (void) &count); row = gtk_list_box_get_row_at_index (list, 20); - g_assert (!gtk_list_box_row_is_selected (row)); + g_assert_false (gtk_list_box_row_is_selected (row)); gtk_list_box_select_row (list, row); - g_assert (gtk_list_box_row_is_selected (row)); - g_assert (callback_row == row); + g_assert_true (gtk_list_box_row_is_selected (row)); + g_assert_true (callback_row == row); g_assert_cmpint (count, ==, 1); row2 = gtk_list_box_get_selected_row (list); - g_assert (row2 == row); + g_assert_true (row2 == row); gtk_list_box_unselect_all (list); row2 = gtk_list_box_get_selected_row (list); - g_assert (row2 == NULL); + g_assert_null (row2); gtk_list_box_select_row (list, row); row2 = gtk_list_box_get_selected_row (list); - g_assert (row2 == row); + g_assert_true (row2 == row); gtk_list_box_set_selection_mode (list, GTK_SELECTION_BROWSE); gtk_list_box_remove (GTK_LIST_BOX (list), GTK_WIDGET (row)); - g_assert (callback_row == NULL); + g_assert_null (callback_row); g_assert_cmpint (count, ==, 4); row2 = gtk_list_box_get_selected_row (list); - g_assert (row2 == NULL); + g_assert_null (row2); row = gtk_list_box_get_row_at_index (list, 20); gtk_list_box_select_row (list, row); - g_assert (gtk_list_box_row_is_selected (row)); - g_assert (callback_row == row); + g_assert_true (gtk_list_box_row_is_selected (row)); + g_assert_true (callback_row == row); g_assert_cmpint (count, ==, 5); gtk_list_box_set_selection_mode (list, GTK_SELECTION_NONE); - g_assert (!gtk_list_box_row_is_selected (row)); - g_assert (callback_row == NULL); + g_assert_false (gtk_list_box_row_is_selected (row)); + g_assert_null (callback_row); g_assert_cmpint (count, ==, 6); row2 = gtk_list_box_get_selected_row (list); - g_assert (row2 == NULL); + g_assert_null (row2); row = gtk_list_box_get_row_at_index (list, 20); index = gtk_list_box_row_get_index (row); @@ -207,7 +207,7 @@ test_multi_selection (void) gtk_widget_show (GTK_WIDGET (list)); g_assert_cmpint (gtk_list_box_get_selection_mode (list), ==, GTK_SELECTION_SINGLE); - g_assert (gtk_list_box_get_selected_rows (list) == NULL); + g_assert_null (gtk_list_box_get_selected_rows (list)); gtk_list_box_set_selection_mode (list, GTK_SELECTION_MULTIPLE); @@ -232,39 +232,39 @@ test_multi_selection (void) l = gtk_list_box_get_selected_rows (list); g_assert_cmpint (g_list_length (l), ==, 100); g_list_free (l); - g_assert (gtk_list_box_row_is_selected (row)); + g_assert_true (gtk_list_box_row_is_selected (row)); gtk_list_box_unselect_all (list); g_assert_cmpint (count, ==, 2); l = gtk_list_box_get_selected_rows (list); - g_assert (l == NULL); - g_assert (!gtk_list_box_row_is_selected (row)); + g_assert_null (l); + g_assert_false (gtk_list_box_row_is_selected (row)); gtk_list_box_select_row (list, row); - g_assert (gtk_list_box_row_is_selected (row)); + g_assert_true (gtk_list_box_row_is_selected (row)); g_assert_cmpint (count, ==, 3); l = gtk_list_box_get_selected_rows (list); g_assert_cmpint (g_list_length (l), ==, 1); - g_assert (l->data == row); + g_assert_true (l->data == row); g_list_free (l); row2 = gtk_list_box_get_row_at_index (list, 40); - g_assert (!gtk_list_box_row_is_selected (row2)); + g_assert_false (gtk_list_box_row_is_selected (row2)); gtk_list_box_select_row (list, row2); - g_assert (gtk_list_box_row_is_selected (row2)); + g_assert_true (gtk_list_box_row_is_selected (row2)); g_assert_cmpint (count, ==, 4); l = gtk_list_box_get_selected_rows (list); g_assert_cmpint (g_list_length (l), ==, 2); - g_assert (l->data == row); - g_assert (l->next->data == row2); + g_assert_true (l->data == row); + g_assert_true (l->next->data == row2); g_list_free (l); gtk_list_box_unselect_row (list, row); - g_assert (!gtk_list_box_row_is_selected (row)); + g_assert_false (gtk_list_box_row_is_selected (row)); g_assert_cmpint (count, ==, 5); l = gtk_list_box_get_selected_rows (list); g_assert_cmpint (g_list_length (l), ==, 1); - g_assert (l->data == row2); + g_assert_true (l->data == row2); g_list_free (l); g_object_unref (list); @@ -321,7 +321,7 @@ test_filter (void) gtk_widget_show (GTK_WIDGET (list)); g_assert_cmpint (gtk_list_box_get_selection_mode (list), ==, GTK_SELECTION_SINGLE); - g_assert (gtk_list_box_get_selected_row (list) == NULL); + g_assert_null (gtk_list_box_get_selected_row (list)); for (i = 0; i < 100; i++) { @@ -413,7 +413,7 @@ test_header (void) gtk_widget_show (GTK_WIDGET (list)); g_assert_cmpint (gtk_list_box_get_selection_mode (list), ==, GTK_SELECTION_SINGLE); - g_assert (gtk_list_box_get_selected_row (list) == NULL); + g_assert_null (gtk_list_box_get_selected_row (list)); for (i = 0; i < 100; i++) { diff --git a/testsuite/gtk/liststore.c b/testsuite/gtk/liststore.c index 0bf77f6890..771f2c4d66 100644 --- a/testsuite/gtk/liststore.c +++ b/testsuite/gtk/liststore.c @@ -125,8 +125,8 @@ check_model (ListStore *fixture, gtk_tree_model_get_iter (GTK_TREE_MODEL (fixture->store), &iter, path); - g_assert (gtk_list_store_iter_is_valid (fixture->store, &iter)); - g_assert (iters_equal (&iter, &fixture->iter[new_order[i]])); + g_assert_true (gtk_list_store_iter_is_valid (fixture->store, &iter)); + g_assert_true (iters_equal (&iter, &fixture->iter[new_order[i]])); gtk_tree_path_next (path); } @@ -145,36 +145,36 @@ list_store_test_insert_high_values (void) store = gtk_list_store_new (1, G_TYPE_INT); gtk_list_store_insert (store, &iter, 1234); - g_assert (gtk_list_store_iter_is_valid (store, &iter)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 1); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_list_store_iter_is_valid (store, &iter)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 1); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); gtk_list_store_insert (store, &iter2, 765); - g_assert (gtk_list_store_iter_is_valid (store, &iter2)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 2); + g_assert_true (gtk_list_store_iter_is_valid (store, &iter2)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 2); /* Walk over the model */ - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 1)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 1)); - g_assert (!gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 1)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 1)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); - g_assert (!gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); g_object_unref (store); } @@ -189,36 +189,36 @@ list_store_test_append (void) store = gtk_list_store_new (1, G_TYPE_INT); gtk_list_store_append (store, &iter); - g_assert (gtk_list_store_iter_is_valid (store, &iter)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 1); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_list_store_iter_is_valid (store, &iter)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 1); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); gtk_list_store_append (store, &iter2); - g_assert (gtk_list_store_iter_is_valid (store, &iter2)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 2); + g_assert_true (gtk_list_store_iter_is_valid (store, &iter2)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 2); /* Walk over the model */ - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 1)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 1)); - g_assert (!gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 1)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 1)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); - g_assert (!gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); g_object_unref (store); } @@ -233,36 +233,36 @@ list_store_test_prepend (void) store = gtk_list_store_new (1, G_TYPE_INT); gtk_list_store_prepend (store, &iter); - g_assert (gtk_list_store_iter_is_valid (store, &iter)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 1); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_list_store_iter_is_valid (store, &iter)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 1); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); gtk_list_store_prepend (store, &iter2); - g_assert (gtk_list_store_iter_is_valid (store, &iter2)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 2); + g_assert_true (gtk_list_store_iter_is_valid (store, &iter2)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 2); /* Walk over the model */ - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 0)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 0)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 1)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 1)); - g_assert (!gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 1)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 1)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 0)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 0)); - g_assert (!gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); g_object_unref (store); } @@ -280,40 +280,40 @@ list_store_test_insert_after (void) gtk_list_store_append (store, &iter2); gtk_list_store_insert_after (store, &iter3, &iter); - g_assert (gtk_list_store_iter_is_valid (store, &iter3)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 3); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); - g_assert (iters_equal (&iter3, &iter_copy)); - g_assert (iter_position (store, &iter3, 1)); + g_assert_true (gtk_list_store_iter_is_valid (store, &iter3)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 3); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); + g_assert_true (iters_equal (&iter3, &iter_copy)); + g_assert_true (iter_position (store, &iter3, 1)); /* Walk over the model */ - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter_copy, 0)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter_copy, 0)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter3, &iter_copy)); - g_assert (iter_position (store, &iter_copy, 1)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter3, &iter_copy)); + g_assert_true (iter_position (store, &iter_copy, 1)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter_copy, 2)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter_copy, 2)); - g_assert (!gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 2)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 2)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 2)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 2)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter3, &iter_copy)); - g_assert (iter_position (store, &iter3, 1)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter3, &iter_copy)); + g_assert_true (iter_position (store, &iter3, 1)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); - g_assert (!gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); g_object_unref (store); } @@ -331,32 +331,32 @@ list_store_test_insert_after_NULL (void) /* move_after NULL is basically a prepend */ gtk_list_store_insert_after (store, &iter2, NULL); - g_assert (gtk_list_store_iter_is_valid (store, &iter2)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 2); + g_assert_true (gtk_list_store_iter_is_valid (store, &iter2)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 2); /* Walk over the model */ - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 0)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 0)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 1)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 1)); - g_assert (!gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 0)); - g_assert (iters_equal (&iter2, &iter_copy)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 0)); + g_assert_true (iters_equal (&iter2, &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 1)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 1)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 0)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 0)); - g_assert (!gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); g_object_unref (store); } @@ -374,43 +374,43 @@ list_store_test_insert_before (void) gtk_list_store_append (store, &iter2); gtk_list_store_insert_before (store, &iter3, &iter2); - g_assert (gtk_list_store_iter_is_valid (store, &iter3)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 3); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); - g_assert (iters_equal (&iter3, &iter_copy)); - g_assert (iter_position (store, &iter3, 1)); + g_assert_true (gtk_list_store_iter_is_valid (store, &iter3)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 3); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); + g_assert_true (iters_equal (&iter3, &iter_copy)); + g_assert_true (iter_position (store, &iter3, 1)); /* Walk over the model */ - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter_copy, 0)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter_copy, 0)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter3, &iter_copy)); - g_assert (iter_position (store, &iter_copy, 1)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter3, &iter_copy)); + g_assert_true (iter_position (store, &iter_copy, 1)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter_copy, 2)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter_copy, 2)); - g_assert (!gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); - g_assert (iters_equal (&iter3, &iter_copy)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); + g_assert_true (iters_equal (&iter3, &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 2)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 2)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 2)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 2)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter3, &iter_copy)); - g_assert (iter_position (store, &iter3, 1)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter3, &iter_copy)); + g_assert_true (iter_position (store, &iter3, 1)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); - g_assert (!gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); g_object_unref (store); } @@ -428,29 +428,29 @@ list_store_test_insert_before_NULL (void) /* move_before NULL is basically an append */ gtk_list_store_insert_before (store, &iter2, NULL); - g_assert (gtk_list_store_iter_is_valid (store, &iter2)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 2); + g_assert_true (gtk_list_store_iter_is_valid (store, &iter2)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 2); /* Walk over the model */ - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 1)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 1)); - g_assert (!gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 1)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 1)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); - g_assert (!gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); g_object_unref (store); } @@ -486,9 +486,9 @@ list_store_test_remove_begin (ListStore *fixture, gtk_tree_model_get_iter (GTK_TREE_MODEL (fixture->store), &iter, path); gtk_tree_path_free (path); - g_assert (gtk_list_store_remove (fixture->store, &iter) == TRUE); - g_assert (!gtk_list_store_iter_is_valid (fixture->store, &fixture->iter[0])); - g_assert (iters_equal (&iter, &fixture->iter[1])); + g_assert_true (gtk_list_store_remove (fixture->store, &iter)); + g_assert_false (gtk_list_store_iter_is_valid (fixture->store, &fixture->iter[0])); + g_assert_true (iters_equal (&iter, &fixture->iter[1])); check_model (fixture, new_order, 0); } @@ -506,9 +506,9 @@ list_store_test_remove_middle (ListStore *fixture, gtk_tree_model_get_iter (GTK_TREE_MODEL (fixture->store), &iter, path); gtk_tree_path_free (path); - g_assert (gtk_list_store_remove (fixture->store, &iter) == TRUE); - g_assert (!gtk_list_store_iter_is_valid (fixture->store, &fixture->iter[2])); - g_assert (iters_equal (&iter, &fixture->iter[3])); + g_assert_true (gtk_list_store_remove (fixture->store, &iter)); + g_assert_false (gtk_list_store_iter_is_valid (fixture->store, &fixture->iter[2])); + g_assert_true (iters_equal (&iter, &fixture->iter[3])); check_model (fixture, new_order, 2); } @@ -526,8 +526,8 @@ list_store_test_remove_end (ListStore *fixture, gtk_tree_model_get_iter (GTK_TREE_MODEL (fixture->store), &iter, path); gtk_tree_path_free (path); - g_assert (gtk_list_store_remove (fixture->store, &iter) == FALSE); - g_assert (!gtk_list_store_iter_is_valid (fixture->store, &fixture->iter[4])); + g_assert_false (gtk_list_store_remove (fixture->store, &iter)); + g_assert_false (gtk_list_store_iter_is_valid (fixture->store, &fixture->iter[4])); check_model (fixture, new_order, 4); } @@ -540,10 +540,10 @@ list_store_test_clear (ListStore *fixture, gtk_list_store_clear (fixture->store); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (fixture->store), NULL) == 0); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (fixture->store), NULL), ==, 0); for (i = 0; i < 5; i++) - g_assert (!gtk_list_store_iter_is_valid (fixture->store, &fixture->iter[i])); + g_assert_true (!gtk_list_store_iter_is_valid (fixture->store, &fixture->iter[i])); } /* reorder */ @@ -570,8 +570,8 @@ list_store_test_swap_begin (ListStore *fixture, GtkTreeIter iter_a; GtkTreeIter iter_b; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_a, "0")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_b, "1")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_a, "0")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_b, "1")); gtk_list_store_swap (fixture->store, &iter_a, &iter_b); check_model (fixture, new_order, -1); @@ -587,8 +587,8 @@ list_store_test_swap_middle_next (ListStore *fixture, GtkTreeIter iter_a; GtkTreeIter iter_b; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_a, "2")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_b, "3")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_a, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_b, "3")); gtk_list_store_swap (fixture->store, &iter_a, &iter_b); check_model (fixture, new_order, -1); @@ -604,8 +604,8 @@ list_store_test_swap_middle_apart (ListStore *fixture, GtkTreeIter iter_a; GtkTreeIter iter_b; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_a, "1")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_b, "3")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_a, "1")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_b, "3")); gtk_list_store_swap (fixture->store, &iter_a, &iter_b); check_model (fixture, new_order, -1); @@ -621,8 +621,8 @@ list_store_test_swap_end (ListStore *fixture, GtkTreeIter iter_a; GtkTreeIter iter_b; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_a, "3")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_b, "4")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_a, "3")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_b, "4")); gtk_list_store_swap (fixture->store, &iter_a, &iter_b); check_model (fixture, new_order, -1); @@ -645,9 +645,9 @@ list_store_test_swap_single (void) iter_copy = iter; gtk_list_store_swap (store, &iter, &iter); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); - g_assert (iters_equal (&iter, &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); + g_assert_true (iters_equal (&iter, &iter_copy)); g_object_unref (store); } @@ -664,8 +664,8 @@ list_store_test_move_after_from_start (ListStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "0")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "0")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "2")); gtk_list_store_move_after (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -681,8 +681,8 @@ list_store_test_move_after_next (ListStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "3")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "3")); gtk_list_store_move_after (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -698,8 +698,8 @@ list_store_test_move_after_apart (ListStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "1")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "3")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "1")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "3")); gtk_list_store_move_after (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -715,8 +715,8 @@ list_store_test_move_after_end (ListStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "4")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "4")); gtk_list_store_move_after (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -732,8 +732,8 @@ list_store_test_move_after_from_end (ListStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "4")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "1")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "4")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "1")); gtk_list_store_move_after (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -751,8 +751,8 @@ list_store_test_move_after_change_ends (ListStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "0")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "4")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "0")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "4")); gtk_list_store_move_after (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -767,7 +767,7 @@ list_store_test_move_after_NULL (ListStore *fixture, GtkTreeIter iter; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); gtk_list_store_move_after (fixture->store, &iter, NULL); check_model (fixture, new_order, -1); @@ -790,14 +790,14 @@ list_store_test_move_after_single (void) iter_copy = iter; gtk_list_store_move_after (store, &iter, NULL); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); - g_assert (iters_equal (&iter, &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); + g_assert_true (iters_equal (&iter, &iter_copy)); gtk_list_store_move_after (store, &iter, &iter); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); - g_assert (iters_equal (&iter, &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); + g_assert_true (iters_equal (&iter, &iter_copy)); g_object_unref (store); } @@ -814,8 +814,8 @@ list_store_test_move_before_next (ListStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "3")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "3")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "2")); gtk_list_store_move_before (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -831,8 +831,8 @@ list_store_test_move_before_apart (ListStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "1")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "3")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "1")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "3")); gtk_list_store_move_before (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -848,8 +848,8 @@ list_store_test_move_before_to_start (ListStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "0")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "0")); gtk_list_store_move_before (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -865,8 +865,8 @@ list_store_test_move_before_from_end (ListStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "4")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "4")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "2")); gtk_list_store_move_before (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -882,8 +882,8 @@ list_store_test_move_before_change_ends (ListStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "4")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "0")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "4")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "0")); gtk_list_store_move_before (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -898,7 +898,7 @@ list_store_test_move_before_NULL (ListStore *fixture, GtkTreeIter iter; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); gtk_list_store_move_before (fixture->store, &iter, NULL); check_model (fixture, new_order, -1); @@ -921,14 +921,14 @@ list_store_test_move_before_single (void) iter_copy = iter; gtk_list_store_move_before (store, &iter, NULL); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); - g_assert (iters_equal (&iter, &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); + g_assert_true (iters_equal (&iter, &iter_copy)); gtk_list_store_move_before (store, &iter, &iter); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); - g_assert (iters_equal (&iter, &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); + g_assert_true (iters_equal (&iter, &iter_copy)); g_object_unref (store); } @@ -944,10 +944,10 @@ list_store_test_iter_previous_invalid (ListStore *fixture, gtk_tree_model_get_iter_first (GTK_TREE_MODEL (fixture->store), &iter); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (fixture->store), - &iter) == FALSE); - g_assert (gtk_list_store_iter_is_valid (fixture->store, &iter) == FALSE); - g_assert (iter.stamp == 0); + g_assert_false (gtk_tree_model_iter_previous (GTK_TREE_MODEL (fixture->store), + &iter)); + g_assert_false (gtk_list_store_iter_is_valid (fixture->store, &iter)); + g_assert_true (iter.stamp == 0); } static void @@ -961,10 +961,10 @@ list_store_test_iter_next_invalid (ListStore *fixture, gtk_tree_model_get_iter (GTK_TREE_MODEL (fixture->store), &iter, path); gtk_tree_path_free (path); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (fixture->store), - &iter) == FALSE); - g_assert (gtk_list_store_iter_is_valid (fixture->store, &iter) == FALSE); - g_assert (iter.stamp == 0); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (fixture->store), + &iter)); + g_assert_false (gtk_list_store_iter_is_valid (fixture->store, &iter)); + g_assert_true (iter.stamp == 0); } static void @@ -974,12 +974,12 @@ list_store_test_iter_children_invalid (ListStore *fixture, GtkTreeIter iter, child; gtk_tree_model_get_iter_first (GTK_TREE_MODEL (fixture->store), &iter); - g_assert (gtk_list_store_iter_is_valid (fixture->store, &iter) == TRUE); + g_assert_true (gtk_list_store_iter_is_valid (fixture->store, &iter)); - g_assert (gtk_tree_model_iter_children (GTK_TREE_MODEL (fixture->store), - &child, &iter) == FALSE); - g_assert (gtk_list_store_iter_is_valid (fixture->store, &child) == FALSE); - g_assert (child.stamp == 0); + g_assert_false (gtk_tree_model_iter_children (GTK_TREE_MODEL (fixture->store), + &child, &iter)); + g_assert_false (gtk_list_store_iter_is_valid (fixture->store, &child)); + g_assert_true (child.stamp == 0); } static void @@ -989,12 +989,12 @@ list_store_test_iter_nth_child_invalid (ListStore *fixture, GtkTreeIter iter, child; gtk_tree_model_get_iter_first (GTK_TREE_MODEL (fixture->store), &iter); - g_assert (gtk_list_store_iter_is_valid (fixture->store, &iter) == TRUE); + g_assert_true (gtk_list_store_iter_is_valid (fixture->store, &iter)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (fixture->store), - &child, &iter, 0) == FALSE); - g_assert (gtk_list_store_iter_is_valid (fixture->store, &child) == FALSE); - g_assert (child.stamp == 0); + g_assert_false (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (fixture->store), + &child, &iter, 0)); + g_assert_false (gtk_list_store_iter_is_valid (fixture->store, &child)); + g_assert_true (child.stamp == 0); } static void @@ -1004,12 +1004,12 @@ list_store_test_iter_parent_invalid (ListStore *fixture, GtkTreeIter iter, child; gtk_tree_model_get_iter_first (GTK_TREE_MODEL (fixture->store), &child); - g_assert (gtk_list_store_iter_is_valid (fixture->store, &child) == TRUE); + g_assert_true (gtk_list_store_iter_is_valid (fixture->store, &child)); - g_assert (gtk_tree_model_iter_parent (GTK_TREE_MODEL (fixture->store), - &iter, &child) == FALSE); - g_assert (gtk_list_store_iter_is_valid (fixture->store, &iter) == FALSE); - g_assert (iter.stamp == 0); + g_assert_false (gtk_tree_model_iter_parent (GTK_TREE_MODEL (fixture->store), + &iter, &child)); + g_assert_false (gtk_list_store_iter_is_valid (fixture->store, &iter)); + g_assert_true (iter.stamp == 0); } diff --git a/testsuite/gtk/main.c b/testsuite/gtk/main.c index d1d3e6ee1b..1a94c43b93 100644 --- a/testsuite/gtk/main.c +++ b/testsuite/gtk/main.c @@ -4,9 +4,12 @@ static void test_init (void) { - g_assert (gtk_is_initialized () == FALSE); - g_assert (gtk_init_check ()); - g_assert (gtk_is_initialized () == TRUE); + gboolean ret; + + g_assert_false (gtk_is_initialized ()); + ret = gtk_init_check (); + g_assert_true (ret); + g_assert_true (gtk_is_initialized ()); } static void @@ -28,7 +31,7 @@ int main (int argc, char *argv[]) { /* Don't use gtk_test_init here because it implicitly initializes GTK. */ - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); gtk_disable_setlocale(); setlocale (LC_ALL, "C"); diff --git a/testsuite/gtk/maplistmodel.c b/testsuite/gtk/maplistmodel.c index b3163a61bf..6e42479624 100644 --- a/testsuite/gtk/maplistmodel.c +++ b/testsuite/gtk/maplistmodel.c @@ -30,7 +30,7 @@ get (GListModel *model, { GObject *object = g_list_model_get_item (model, position); guint number; - g_assert (object != NULL); + g_assert_nonnull (object); number = GPOINTER_TO_UINT (g_object_get_qdata (object, number_quark)); g_object_unref (object); return number; @@ -71,7 +71,7 @@ splice (GListStore *store, for (i = 0; i < added; i++) { /* 0 cannot be differentiated from NULL, so don't use it */ - g_assert (numbers[i] != 0); + g_assert_true (numbers[i] != 0); objects[i] = g_object_new (G_TYPE_OBJECT, NULL); g_object_set_qdata (objects[i], number_quark, GUINT_TO_POINTER (numbers[i])); } @@ -90,7 +90,7 @@ add (GListStore *store, GObject *object; /* 0 cannot be differentiated from NULL, so don't use it */ - g_assert (number != 0); + g_assert_cmpint (number, !=, 0); object = g_object_new (G_TYPE_OBJECT, NULL); g_object_set_qdata (object, number_quark, GUINT_TO_POINTER (number)); @@ -141,7 +141,7 @@ items_changed (GListModel *model, guint added, GString *changes) { - g_assert (removed != 0 || added != 0); + g_assert_true (removed != 0 || added != 0); if (changes->len) g_string_append (changes, ", "); @@ -289,7 +289,7 @@ test_set_map_func (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); number_quark = g_quark_from_static_string ("Hell and fire was spawned to be released."); diff --git a/testsuite/gtk/modelrefcount.c b/testsuite/gtk/modelrefcount.c index b3e48ce6ec..48222dc243 100644 --- a/testsuite/gtk/modelrefcount.c +++ b/testsuite/gtk/modelrefcount.c @@ -549,7 +549,7 @@ test_row_reference_list_remove (void) gtk_tree_store_remove (GTK_TREE_STORE (model), &iter2); - g_assert (!gtk_tree_model_get_iter_first (model, &iter0)); + g_assert_false (gtk_tree_model_get_iter_first (model, &iter0)); gtk_tree_row_reference_free (row_ref); diff --git a/testsuite/gtk/multiselection.c b/testsuite/gtk/multiselection.c index c1457488e3..bdc896073b 100644 --- a/testsuite/gtk/multiselection.c +++ b/testsuite/gtk/multiselection.c @@ -30,7 +30,7 @@ get (GListModel *model, { GObject *object = g_list_model_get_item (model, position); guint ret; - g_assert (object != NULL); + g_assert_nonnull (object); ret = GPOINTER_TO_UINT (g_object_get_qdata (object, number_quark)); g_object_unref (object); return ret; @@ -82,7 +82,7 @@ make_object (guint number) GObject *object; /* 0 cannot be differentiated from NULL, so don't use it */ - g_assert (number != 0); + g_assert_cmpint (number, !=, 0); object = g_object_new (G_TYPE_OBJECT, NULL); g_object_set_qdata (object, number_quark, GUINT_TO_POINTER (number)); @@ -201,7 +201,7 @@ items_changed (GListModel *model, guint added, GString *changes) { - g_assert (removed != 0 || added != 0); + g_assert_true (removed != 0 || added != 0); if (changes->len) g_string_append (changes, ", "); @@ -684,7 +684,7 @@ test_set_model (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); g_test_bug_base ("http://bugzilla.gnome.org/show_bug.cgi?id=%s"); diff --git a/testsuite/gtk/no-gtk-init.c b/testsuite/gtk/no-gtk-init.c index b7d1be66d7..51ba78acef 100644 --- a/testsuite/gtk/no-gtk-init.c +++ b/testsuite/gtk/no-gtk-init.c @@ -46,7 +46,7 @@ main (int argc, char *argv[]) { /* Keep in sync with gtk_test_init() */ - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); g_setenv ("GTK_MODULES", "", TRUE); setlocale (LC_ALL, "C"); diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c index 2167d384d5..1e0526569b 100644 --- a/testsuite/gtk/objects-finalize.c +++ b/testsuite/gtk/objects-finalize.c @@ -37,7 +37,7 @@ main_loop_quit_cb (gpointer data) g_main_context_wakeup (NULL); - g_assert (finalized); + g_assert_true (finalized); return FALSE; } @@ -98,7 +98,7 @@ test_finalize_object (gconstpointer data) } else object = g_object_new (test_type, NULL); - g_assert (G_IS_OBJECT (object)); + g_assert_true (G_IS_OBJECT (object)); /* Make sure we have the only reference */ if (g_object_is_floating (object)) diff --git a/testsuite/gtk/papersize.c b/testsuite/gtk/papersize.c index 6af7acc643..d85e9d92aa 100644 --- a/testsuite/gtk/papersize.c +++ b/testsuite/gtk/papersize.c @@ -23,52 +23,52 @@ test_parse (void) GtkPaperSize *p; p = gtk_paper_size_new (GTK_PAPER_NAME_A4); - g_assert (p != NULL); + g_assert_nonnull (p); g_assert_cmpint (gtk_paper_size_get_width (p, GTK_UNIT_MM), ==, 210); g_assert_cmpint (gtk_paper_size_get_height (p, GTK_UNIT_MM), ==, 297); g_assert_cmpstr (gtk_paper_size_get_name (p), ==, "iso_a4"); g_assert_cmpstr (gtk_paper_size_get_display_name (p), ==, "A4"); g_assert_cmpstr (gtk_paper_size_get_ppd_name (p), ==, "A4"); - g_assert (!gtk_paper_size_is_custom (p)); + g_assert_false (gtk_paper_size_is_custom (p)); gtk_paper_size_free (p); p = gtk_paper_size_new (GTK_PAPER_NAME_B5); - g_assert (p != NULL); + g_assert_nonnull (p); g_assert_cmpint (gtk_paper_size_get_width (p, GTK_UNIT_MM), ==, 176); g_assert_cmpint (gtk_paper_size_get_height (p, GTK_UNIT_MM), ==, 250); g_assert_cmpstr (gtk_paper_size_get_name (p), ==, "iso_b5"); g_assert_cmpstr (gtk_paper_size_get_display_name (p), ==, "B5"); g_assert_cmpstr (gtk_paper_size_get_ppd_name (p), ==, "ISOB5"); - g_assert (!gtk_paper_size_is_custom (p)); + g_assert_false (gtk_paper_size_is_custom (p)); gtk_paper_size_free (p); p = gtk_paper_size_new (GTK_PAPER_NAME_EXECUTIVE); - g_assert (p != NULL); + g_assert_nonnull (p); g_assert_cmpint (gtk_paper_size_get_width (p, GTK_UNIT_MM), ==, 184); g_assert_cmpint (gtk_paper_size_get_height (p, GTK_UNIT_MM), ==, 266); g_assert_cmpstr (gtk_paper_size_get_name (p), ==, "na_executive"); g_assert_cmpstr (gtk_paper_size_get_display_name (p), ==, "Executive"); g_assert_cmpstr (gtk_paper_size_get_ppd_name (p), ==, "Executive"); - g_assert (!gtk_paper_size_is_custom (p)); + g_assert_false (gtk_paper_size_is_custom (p)); gtk_paper_size_free (p); p = gtk_paper_size_new ("iso_a4_210x297mm"); - g_assert (p != NULL); + g_assert_nonnull (p); g_assert_cmpint (gtk_paper_size_get_width (p, GTK_UNIT_MM), ==, 210); g_assert_cmpint (gtk_paper_size_get_height (p, GTK_UNIT_MM), ==, 297); g_assert_cmpstr (gtk_paper_size_get_name (p), ==, "iso_a4"); g_assert_cmpstr (gtk_paper_size_get_display_name (p), ==, "A4"); g_assert_cmpstr (gtk_paper_size_get_ppd_name (p), ==, "A4"); - g_assert (!gtk_paper_size_is_custom (p)); + g_assert_false (gtk_paper_size_is_custom (p)); gtk_paper_size_free (p); p = gtk_paper_size_new ("custom_w1_20x30in"); - g_assert (p != NULL); + g_assert_nonnull (p); g_assert_cmpint (gtk_paper_size_get_width (p, GTK_UNIT_INCH), ==, 20); g_assert_cmpint (gtk_paper_size_get_height (p, GTK_UNIT_INCH), ==, 30); g_assert_cmpstr (gtk_paper_size_get_name (p), ==, "custom_w1"); g_assert_cmpstr (gtk_paper_size_get_display_name (p), ==, "custom_w1"); - g_assert (gtk_paper_size_is_custom (p)); + g_assert_true (gtk_paper_size_is_custom (p)); gtk_paper_size_free (p); } @@ -82,10 +82,10 @@ test_compare (void) b = gtk_paper_size_new (GTK_PAPER_NAME_B5); c = gtk_paper_size_new ("custom_w1_20x30in"); - g_assert (gtk_paper_size_is_equal (a1, a2)); - g_assert (!gtk_paper_size_is_equal (a1, b)); - g_assert (!gtk_paper_size_is_equal (a1, c)); - g_assert (!gtk_paper_size_is_equal (b, c)); + g_assert_true (gtk_paper_size_is_equal (a1, a2)); + g_assert_false (gtk_paper_size_is_equal (a1, b)); + g_assert_false (gtk_paper_size_is_equal (a1, c)); + g_assert_false (gtk_paper_size_is_equal (b, c)); gtk_paper_size_free (a1); gtk_paper_size_free (a2); diff --git a/testsuite/gtk/propertylookuplistmodel.c b/testsuite/gtk/propertylookuplistmodel.c index b151e15a62..df0f78a415 100644 --- a/testsuite/gtk/propertylookuplistmodel.c +++ b/testsuite/gtk/propertylookuplistmodel.c @@ -67,7 +67,7 @@ items_changed (GListModel *model, guint added, GString *changes) { - g_assert (removed != 0 || added != 0); + g_assert_true (removed != 0 || added != 0); if (changes->len) g_string_append (changes, ", "); diff --git a/testsuite/gtk/rbtree-crash.c b/testsuite/gtk/rbtree-crash.c index f1394ad773..6e249b7627 100644 --- a/testsuite/gtk/rbtree-crash.c +++ b/testsuite/gtk/rbtree-crash.c @@ -292,7 +292,7 @@ test_crash2 (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); g_test_add_func ("/rbtree/crash", test_crash); diff --git a/testsuite/gtk/rbtree.c b/testsuite/gtk/rbtree.c index b40ae6eb4c..b735b7da47 100644 --- a/testsuite/gtk/rbtree.c +++ b/testsuite/gtk/rbtree.c @@ -69,8 +69,8 @@ _count_nodes (GtkTreeRBTree *tree, if (gtk_tree_rbtree_is_nil (node)) return 0; - g_assert (node->left); - g_assert (node->right); + g_assert_true (node->left); + g_assert_true (node->right); res = (_count_nodes (tree, node->left) + _count_nodes (tree, node->right) + 1); @@ -115,11 +115,11 @@ gtk_tree_rbtree_test_dirty (GtkTreeRBTree *tree, GtkTreeRBNode *node, int expected_dirtyness) { - g_assert (node); + g_assert_nonnull (node); if (expected_dirtyness) { - g_assert (GTK_TREE_RBNODE_FLAG_SET (node, GTK_TREE_RBNODE_COLUMN_INVALID) || + g_assert_true (GTK_TREE_RBNODE_FLAG_SET (node, GTK_TREE_RBNODE_COLUMN_INVALID) || GTK_TREE_RBNODE_FLAG_SET (node, GTK_TREE_RBNODE_INVALID) || GTK_TREE_RBNODE_FLAG_SET (node->left, GTK_TREE_RBNODE_DESCENDANTS_INVALID) || GTK_TREE_RBNODE_FLAG_SET (node->right, GTK_TREE_RBNODE_DESCENDANTS_INVALID) || @@ -127,14 +127,14 @@ gtk_tree_rbtree_test_dirty (GtkTreeRBTree *tree, } else { - g_assert (!GTK_TREE_RBNODE_FLAG_SET (node, GTK_TREE_RBNODE_COLUMN_INVALID) && + g_assert_true (!GTK_TREE_RBNODE_FLAG_SET (node, GTK_TREE_RBNODE_COLUMN_INVALID) && !GTK_TREE_RBNODE_FLAG_SET (node, GTK_TREE_RBNODE_INVALID)); if (!gtk_tree_rbtree_is_nil (node->left)) - g_assert (!GTK_TREE_RBNODE_FLAG_SET (node->left, GTK_TREE_RBNODE_DESCENDANTS_INVALID)); + g_assert_true (!GTK_TREE_RBNODE_FLAG_SET (node->left, GTK_TREE_RBNODE_DESCENDANTS_INVALID)); if (!gtk_tree_rbtree_is_nil (node->right)) - g_assert (!GTK_TREE_RBNODE_FLAG_SET (node->right, GTK_TREE_RBNODE_DESCENDANTS_INVALID)); + g_assert_true (!GTK_TREE_RBNODE_FLAG_SET (node->right, GTK_TREE_RBNODE_DESCENDANTS_INVALID)); if (node->children != NULL) - g_assert (!GTK_TREE_RBNODE_FLAG_SET (node->children->root, GTK_TREE_RBNODE_DESCENDANTS_INVALID)); + g_assert_true (!GTK_TREE_RBNODE_FLAG_SET (node->children->root, GTK_TREE_RBNODE_DESCENDANTS_INVALID)); } if (!gtk_tree_rbtree_is_nil (node->left)) @@ -153,15 +153,15 @@ gtk_tree_rbtree_test_structure_helper (GtkTreeRBTree *tree, { guint left_blacks, right_blacks; - g_assert (!gtk_tree_rbtree_is_nil (node)); + g_assert_false (gtk_tree_rbtree_is_nil (node)); - g_assert (node->left != NULL); - g_assert (node->right != NULL); - g_assert (node->parent != NULL); + g_assert_nonnull (node->left); + g_assert_nonnull (node->right); + g_assert_nonnull (node->parent); if (!gtk_tree_rbtree_is_nil (node->left)) { - g_assert (node->left->parent == node); + g_assert_true (node->left->parent == node); left_blacks = gtk_tree_rbtree_test_structure_helper (tree, node->left); } else @@ -169,7 +169,7 @@ gtk_tree_rbtree_test_structure_helper (GtkTreeRBTree *tree, if (!gtk_tree_rbtree_is_nil (node->right)) { - g_assert (node->right->parent == node); + g_assert_true (node->right->parent == node); right_blacks = gtk_tree_rbtree_test_structure_helper (tree, node->right); } else @@ -177,13 +177,13 @@ gtk_tree_rbtree_test_structure_helper (GtkTreeRBTree *tree, if (node->children != NULL) { - g_assert (node->children->parent_tree == tree); - g_assert (node->children->parent_node == node); + g_assert_true (node->children->parent_tree == tree); + g_assert_true (node->children->parent_node == node); gtk_tree_rbtree_test_structure (node->children); } - g_assert (left_blacks == right_blacks); + g_assert_true (left_blacks == right_blacks); return left_blacks + (GTK_TREE_RBNODE_GET_COLOR (node) == GTK_TREE_RBNODE_BLACK ? 1 : 0); } @@ -191,11 +191,11 @@ gtk_tree_rbtree_test_structure_helper (GtkTreeRBTree *tree, static void gtk_tree_rbtree_test_structure (GtkTreeRBTree *tree) { - g_assert (tree->root); + g_assert_nonnull (tree->root); if (gtk_tree_rbtree_is_nil (tree->root)) return; - g_assert (gtk_tree_rbtree_is_nil (tree->root->parent)); + g_assert_true (gtk_tree_rbtree_is_nil (tree->root->parent)); gtk_tree_rbtree_test_structure_helper (tree, tree->root); } @@ -217,12 +217,12 @@ gtk_tree_rbtree_test (GtkTreeRBTree *tree) gtk_tree_rbtree_test_structure (tmp_tree); - g_assert ((_count_nodes (tmp_tree, tmp_tree->root->left) + + g_assert_true ((_count_nodes (tmp_tree, tmp_tree->root->left) + _count_nodes (tmp_tree, tmp_tree->root->right) + 1) == tmp_tree->root->count); gtk_tree_rbtree_test_height (tmp_tree, tmp_tree->root); gtk_tree_rbtree_test_dirty (tmp_tree, tmp_tree->root, GTK_TREE_RBNODE_FLAG_SET (tmp_tree->root, GTK_TREE_RBNODE_DESCENDANTS_INVALID)); - g_assert (count_total (tmp_tree, tmp_tree->root) == tmp_tree->root->total_count); + g_assert_true (count_total (tmp_tree, tmp_tree->root) == tmp_tree->root->total_count); } /* gtk_rbtree_print() - unused, for debugging only */ @@ -286,7 +286,7 @@ append_elements (GtkTreeRBTree *tree, GtkTreeRBNode *node; guint i; - g_assert (depth > 0); + g_assert_cmpint (depth, >, 0); node = NULL; depth--; @@ -348,9 +348,9 @@ test_insert_after (void) { node = gtk_tree_rbtree_insert_after (tree, node, i, TRUE); gtk_tree_rbtree_test (tree); - g_assert (tree->root->count == i); - g_assert (tree->root->total_count == i); - g_assert (tree->root->offset == i * (i + 1) / 2); + g_assert_cmpint (tree->root->count, ==, i); + g_assert_cmpint (tree->root->total_count, ==, i); + g_assert_cmpint (tree->root->offset, ==, i * (i + 1) / 2); } gtk_tree_rbtree_free (tree); @@ -370,9 +370,9 @@ test_insert_before (void) { node = gtk_tree_rbtree_insert_before (tree, node, i, TRUE); gtk_tree_rbtree_test (tree); - g_assert (tree->root->count == i); - g_assert (tree->root->total_count == i); - g_assert (tree->root->offset == i * (i + 1) / 2); + g_assert_cmpint (tree->root->count, ==, i); + g_assert_cmpint (tree->root->total_count, ==, i); + g_assert_cmpint (tree->root->offset, ==, i * (i + 1) / 2); } gtk_tree_rbtree_free (tree); @@ -501,9 +501,9 @@ test_reorder (void) node != NULL; node = gtk_tree_rbtree_next (tree, node), i++) { - g_assert (GTK_TREE_RBNODE_GET_HEIGHT (node) == i); + g_assert_cmpint (GTK_TREE_RBNODE_GET_HEIGHT (node), ==, i); } - g_assert (i == n); + g_assert_cmpint (i, ==, n); gtk_tree_rbtree_free (tree); @@ -514,7 +514,7 @@ int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); g_test_add_func ("/rbtree/create", test_create); diff --git a/testsuite/gtk/recentmanager.c b/testsuite/gtk/recentmanager.c index 20f0cc1f5f..dbbce1142e 100644 --- a/testsuite/gtk/recentmanager.c +++ b/testsuite/gtk/recentmanager.c @@ -30,10 +30,10 @@ recent_manager_get_default (void) GtkRecentManager *manager2; manager = gtk_recent_manager_get_default (); - g_assert (manager != NULL); + g_assert_nonnull (manager); manager2 = gtk_recent_manager_get_default (); - g_assert (manager == manager2); + g_assert_true (manager == manager2); } static void @@ -93,7 +93,7 @@ recent_manager_add (void) res = gtk_recent_manager_add_full (manager, uri, recent_data); - g_assert (res == TRUE); + g_assert_true (res); g_slice_free (GtkRecentData, recent_data); } @@ -183,10 +183,10 @@ recent_manager_has_item (void) manager = gtk_recent_manager_get_default (); res = gtk_recent_manager_has_item (manager, "file:///tmp/testrecentdoesnotexist.txt"); - g_assert (res == FALSE); + g_assert_false (res); res = gtk_recent_manager_has_item (manager, uri); - g_assert (res == TRUE); + g_assert_true (res); } static void @@ -203,22 +203,20 @@ recent_manager_move_item (void) "file:///tmp/testrecentdoesnotexist.txt", uri2, &error); - g_assert (res == FALSE); - g_assert (error != NULL); - g_assert (error->domain == GTK_RECENT_MANAGER_ERROR); - g_assert (error->code == GTK_RECENT_MANAGER_ERROR_NOT_FOUND); + g_assert_false (res); + g_assert_error (error, GTK_RECENT_MANAGER_ERROR, GTK_RECENT_MANAGER_ERROR_NOT_FOUND); g_error_free (error); error = NULL; res = gtk_recent_manager_move_item (manager, uri, uri2, &error); - g_assert (res == TRUE); - g_assert (error == NULL); + g_assert_true (res); + g_assert_null (error); res = gtk_recent_manager_has_item (manager, uri); - g_assert (res == FALSE); + g_assert_false (res); res = gtk_recent_manager_has_item (manager, uri2); - g_assert (res == TRUE); + g_assert_true (res); } static void @@ -234,18 +232,16 @@ recent_manager_lookup_item (void) info = gtk_recent_manager_lookup_item (manager, "file:///tmp/testrecentdoesnotexist.txt", &error); - g_assert (info == NULL); - g_assert (error != NULL); - g_assert (error->domain == GTK_RECENT_MANAGER_ERROR); - g_assert (error->code == GTK_RECENT_MANAGER_ERROR_NOT_FOUND); + g_assert_null (info); + g_assert_error (error, GTK_RECENT_MANAGER_ERROR, GTK_RECENT_MANAGER_ERROR_NOT_FOUND); g_error_free (error); error = NULL; info = gtk_recent_manager_lookup_item (manager, uri2, &error); - g_assert (info != NULL); - g_assert (error == NULL); + g_assert_nonnull (info); + g_assert_null (error); - g_assert (gtk_recent_info_has_application (info, "testrecentchooser")); + g_assert_true (gtk_recent_info_has_application (info, "testrecentchooser")); gtk_recent_info_unref (info); } @@ -263,20 +259,18 @@ recent_manager_remove_item (void) res = gtk_recent_manager_remove_item (manager, "file:///tmp/testrecentdoesnotexist.txt", &error); - g_assert (res == FALSE); - g_assert (error != NULL); - g_assert (error->domain == GTK_RECENT_MANAGER_ERROR); - g_assert (error->code == GTK_RECENT_MANAGER_ERROR_NOT_FOUND); + g_assert_false (res); + g_assert_error (error, GTK_RECENT_MANAGER_ERROR, GTK_RECENT_MANAGER_ERROR_NOT_FOUND); g_error_free (error); /* remove an item that's actually there */ error = NULL; res = gtk_recent_manager_remove_item (manager, uri2, &error); - g_assert (res == TRUE); - g_assert (error == NULL); + g_assert_true (res); + g_assert_null (error); res = gtk_recent_manager_has_item (manager, uri2); - g_assert (res == FALSE); + g_assert_false (res); } static void @@ -292,7 +286,7 @@ recent_manager_purge (void) /* purge, add 1, purge again and check that 1 item has been purged */ error = NULL; n = gtk_recent_manager_purge_items (manager, &error); - g_assert (error == NULL); + g_assert_null (error); recent_data = g_slice_new0 (GtkRecentData); recent_data->mime_type = (char *)"text/plain"; @@ -303,8 +297,8 @@ recent_manager_purge (void) error = NULL; n = gtk_recent_manager_purge_items (manager, &error); - g_assert (error == NULL); - g_assert (n == 1); + g_assert_null (error); + g_assert_cmpint (n, ==, 1); } int diff --git a/testsuite/gtk/regression-tests.c b/testsuite/gtk/regression-tests.c index 306333e4cd..011f08b5bc 100644 --- a/testsuite/gtk/regression-tests.c +++ b/testsuite/gtk/regression-tests.c @@ -33,7 +33,7 @@ test_9d6da33ff5c5e41e3521e1afd63d2d67bc915753 (void) gtk_widget_set_sensitive (label, TRUE); gtk_widget_set_sensitive (window, TRUE); - g_assert (gtk_widget_get_sensitive (label)); + g_assert_true (gtk_widget_get_sensitive (label)); gtk_window_destroy (GTK_WINDOW (window)); } @@ -51,7 +51,7 @@ test_94f00eb04dd1433cf1cc9a3341f485124e38abd1 (void) gtk_widget_set_sensitive (label, FALSE); gtk_widget_set_sensitive (label, TRUE); - g_assert (!gtk_widget_is_sensitive (label)); + g_assert_false (gtk_widget_is_sensitive (label)); gtk_window_destroy (GTK_WINDOW (window)); } diff --git a/testsuite/gtk/revealer-size.c b/testsuite/gtk/revealer-size.c index ca328a9c03..83a64b1f2c 100644 --- a/testsuite/gtk/revealer-size.c +++ b/testsuite/gtk/revealer-size.c @@ -134,7 +134,7 @@ int main (int argc, char **argv) { gtk_init (); - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); g_test_add_func ("/sizing/revealer/slide_right_animations", slide_right_animations); g_test_add_func ("/sizing/revealer/slide_right_no_animations", slide_right_no_animations); diff --git a/testsuite/gtk/scrolledwindow.c b/testsuite/gtk/scrolledwindow.c index 5aaf2d31c2..b606af5e03 100644 --- a/testsuite/gtk/scrolledwindow.c +++ b/testsuite/gtk/scrolledwindow.c @@ -270,7 +270,7 @@ int main (int argc, char **argv) { gtk_init (); - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); g_test_add_func ("/sizing/scrolledwindow/overlay_automatic_width_min", overlay_automatic_width_min); g_test_add_func ("/sizing/scrolledwindow/overlay_automatic_height_min", overlay_automatic_height_min); diff --git a/testsuite/gtk/searchbar.c b/testsuite/gtk/searchbar.c index 0e1427f2a7..ec95875736 100644 --- a/testsuite/gtk/searchbar.c +++ b/testsuite/gtk/searchbar.c @@ -11,11 +11,11 @@ capture_widget_destroy (void) gtk_search_bar_set_key_capture_widget (GTK_SEARCH_BAR (searchbar), button); - g_assert (gtk_search_bar_get_key_capture_widget (GTK_SEARCH_BAR (searchbar)) == button); + g_assert_true (gtk_search_bar_get_key_capture_widget (GTK_SEARCH_BAR (searchbar)) == button); g_object_unref (button); - g_assert (gtk_search_bar_get_key_capture_widget (GTK_SEARCH_BAR (searchbar)) == NULL); + g_assert_null (gtk_search_bar_get_key_capture_widget (GTK_SEARCH_BAR (searchbar))); g_object_unref (searchbar); } @@ -31,11 +31,11 @@ capture_widget_unset (void) gtk_search_bar_set_key_capture_widget (GTK_SEARCH_BAR (searchbar), button); - g_assert (gtk_search_bar_get_key_capture_widget (GTK_SEARCH_BAR (searchbar)) == button); + g_assert_true (gtk_search_bar_get_key_capture_widget (GTK_SEARCH_BAR (searchbar)) == button); gtk_search_bar_set_key_capture_widget (GTK_SEARCH_BAR (searchbar), NULL); - g_assert (gtk_search_bar_get_key_capture_widget (GTK_SEARCH_BAR (searchbar)) == NULL); + g_assert_null (gtk_search_bar_get_key_capture_widget (GTK_SEARCH_BAR (searchbar))); g_object_unref (searchbar); g_object_unref (button); diff --git a/testsuite/gtk/singleselection.c b/testsuite/gtk/singleselection.c index 85e1f4163b..88283c36fc 100644 --- a/testsuite/gtk/singleselection.c +++ b/testsuite/gtk/singleselection.c @@ -30,7 +30,7 @@ get (GListModel *model, { guint number; GObject *object = g_list_model_get_item (model, position); - g_assert (object != NULL); + g_assert_nonnull (object); number = GPOINTER_TO_UINT (g_object_get_qdata (object, number_quark)); g_object_unref (object); return number; @@ -82,7 +82,7 @@ make_object (guint number) GObject *object; /* 0 cannot be differentiated from NULL, so don't use it */ - g_assert (number != 0); + g_assert_cmpint (number, !=, 0); object = g_object_new (G_TYPE_OBJECT, NULL); g_object_set_qdata (object, number_quark, GUINT_TO_POINTER (number)); @@ -197,7 +197,7 @@ items_changed (GListModel *model, guint added, GString *changes) { - g_assert (removed != 0 || added != 0); + g_assert_true (removed != 0 || added != 0); if (changes->len) g_string_append (changes, ", "); @@ -709,7 +709,7 @@ test_set_model (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); number_quark = g_quark_from_static_string ("Hell and fire was spawned to be released."); diff --git a/testsuite/gtk/slicelistmodel.c b/testsuite/gtk/slicelistmodel.c index b57eb253fe..eab5bfec56 100644 --- a/testsuite/gtk/slicelistmodel.c +++ b/testsuite/gtk/slicelistmodel.c @@ -29,7 +29,7 @@ get (GListModel *model, { GObject *object = g_list_model_get_item (model, position); guint number; - g_assert (object != NULL); + g_assert_nonnull (object); number = GPOINTER_TO_UINT (g_object_get_qdata (object, number_quark)); g_object_unref (object); return number; @@ -62,7 +62,7 @@ make_object (guint number) GObject *object; /* 0 cannot be differentiated from NULL, so don't use it */ - g_assert (number != 0); + g_assert_cmpint (number, !=, 0); object = g_object_new (G_TYPE_OBJECT, NULL); g_object_set_qdata (object, number_quark, GUINT_TO_POINTER (number)); @@ -151,7 +151,7 @@ items_changed (GListModel *model, guint added, GString *changes) { - g_assert (removed != 0 || added != 0); + g_assert_true (removed != 0 || added != 0); if (changes->len) g_string_append (changes, ", "); @@ -361,7 +361,7 @@ test_bug_skip_amount (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); number_quark = g_quark_from_static_string ("Hell and fire was spawned to be released."); diff --git a/testsuite/gtk/sorter.c b/testsuite/gtk/sorter.c index 6822c9ad08..ee54ee1edd 100644 --- a/testsuite/gtk/sorter.c +++ b/testsuite/gtk/sorter.c @@ -36,7 +36,7 @@ get (GListModel *model, { GObject *object = g_list_model_get_item (model, position); guint number; - g_assert (object != NULL); + g_assert_nonnull (object); number = get_number (object); g_object_unref (object); return number; @@ -63,7 +63,7 @@ append_digit (GString *s, if (digit == 0) return; - g_assert (digit < 10); + g_assert_cmpint (digit, <, 10); if (s->len) g_string_append_c (s, ' '); @@ -110,7 +110,7 @@ get_spelled_out (gpointer object) guint n = GPOINTER_TO_UINT (g_object_get_qdata (object, number_quark)); GString *s; - g_assert (n < 1000000); + g_assert_cmpint (n, <, 1000000); if (n == 0) return g_strdup ("Zero"); @@ -160,7 +160,7 @@ add (GListStore *store, GObject *object; /* 0 cannot be differentiated from NULL, so don't use it */ - g_assert (number != 0); + g_assert_cmpint (number, !=, 0); object = g_object_new (G_TYPE_OBJECT, NULL); g_object_set_qdata (object, number_quark, GUINT_TO_POINTER (number)); @@ -662,7 +662,7 @@ test_stable (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); number_quark = g_quark_from_static_string ("Like a trashcan fire in a prison cell"); diff --git a/testsuite/gtk/sortlistmodel-exhaustive.c b/testsuite/gtk/sortlistmodel-exhaustive.c index 4b8e2bacbb..76aa8bfa2f 100644 --- a/testsuite/gtk/sortlistmodel-exhaustive.c +++ b/testsuite/gtk/sortlistmodel-exhaustive.c @@ -455,7 +455,7 @@ add_test_for_all_models (const char *name, int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); add_test_for_all_models ("two-sorters", test_two_sorters); diff --git a/testsuite/gtk/sortlistmodel.c b/testsuite/gtk/sortlistmodel.c index 5c63cff27d..515d7a2e10 100644 --- a/testsuite/gtk/sortlistmodel.c +++ b/testsuite/gtk/sortlistmodel.c @@ -30,7 +30,7 @@ get (GListModel *model, { GObject *object = g_list_model_get_item (model, position); guint number; - g_assert (object != NULL); + g_assert_nonnull (object); number = GPOINTER_TO_UINT (g_object_get_qdata (object, number_quark)); g_object_unref (object); return number; @@ -65,7 +65,7 @@ splice (GListStore *store, for (i = 0; i < added; i++) { /* 0 cannot be differentiated from NULL, so don't use it */ - g_assert (numbers[i] != 0); + g_assert_cmpint (numbers[i], !=, 0); objects[i] = g_object_new (G_TYPE_OBJECT, NULL); g_object_set_qdata (objects[i], number_quark, GUINT_TO_POINTER (numbers[i])); } @@ -83,7 +83,7 @@ add (GListStore *store, GObject *object; /* 0 cannot be differentiated from NULL, so don't use it */ - g_assert (number != 0); + g_assert_cmpint (number, !=, 0); object = g_object_new (G_TYPE_OBJECT, NULL); g_object_set_qdata (object, number_quark, GUINT_TO_POINTER (number)); @@ -99,7 +99,7 @@ insert (GListStore *store, GObject *object; /* 0 cannot be differentiated from NULL, so don't use it */ - g_assert (number != 0); + g_assert_cmpint (number, !=, 0); object = g_object_new (G_TYPE_OBJECT, NULL); g_object_set_qdata (object, number_quark, GUINT_TO_POINTER (number)); @@ -153,7 +153,7 @@ items_changed (GListModel *model, guint added, GString *changes) { - g_assert (removed != 0 || added != 0); + g_assert_true (removed != 0 || added != 0); if (changes->len) g_string_append (changes, ", "); @@ -213,7 +213,7 @@ new_model (gpointer model) GtkSortListModel *result; GString *changes; - g_assert (model == NULL || G_IS_LIST_MODEL (model)); + g_assert_true (model == NULL || G_IS_LIST_MODEL (model)); if (model) { @@ -537,7 +537,7 @@ test_out_of_bounds_access (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); number_quark = g_quark_from_static_string ("Hell and fire was spawned to be released."); diff --git a/testsuite/gtk/sortmodel.c b/testsuite/gtk/sortmodel.c index 3fbe0f2549..f717e4a894 100644 --- a/testsuite/gtk/sortmodel.c +++ b/testsuite/gtk/sortmodel.c @@ -765,9 +765,9 @@ check_sort_order (GtkTreeModel *sort_model, gtk_tree_model_get (sort_model, &siter, 0, &value, -1); if (sort_order == GTK_SORT_ASCENDING) - g_assert (prev_value <= value); + g_assert_cmpint (prev_value, <=, value); else - g_assert (prev_value >= value); + g_assert_cmpint (prev_value, >=, value); prev_value = value; } @@ -1118,17 +1118,17 @@ iter_test (GtkTreeModel *model) { GtkTreeIter a, b; - g_assert (gtk_tree_model_get_iter_first (model, &a)); + g_assert_true (gtk_tree_model_get_iter_first (model, &a)); - g_assert (gtk_tree_model_iter_next (model, &a)); - g_assert (gtk_tree_model_iter_next (model, &a)); + g_assert_true (gtk_tree_model_iter_next (model, &a)); + g_assert_true (gtk_tree_model_iter_next (model, &a)); b = a; - g_assert (!gtk_tree_model_iter_next (model, &b)); + g_assert_false (gtk_tree_model_iter_next (model, &b)); - g_assert (gtk_tree_model_iter_previous (model, &a)); - g_assert (gtk_tree_model_iter_previous (model, &a)); + g_assert_true (gtk_tree_model_iter_previous (model, &a)); + g_assert_true (gtk_tree_model_iter_previous (model, &a)); b = a; - g_assert (!gtk_tree_model_iter_previous (model, &b)); + g_assert_false (gtk_tree_model_iter_previous (model, &b)); } static void @@ -1236,57 +1236,57 @@ sort_column_change (void) column_changed = 0; g_signal_connect (sorted, "sort-column-changed", G_CALLBACK (sort_column_changed), NULL); - g_assert (!gtk_tree_sortable_has_default_sort_func (GTK_TREE_SORTABLE (sorted))); + g_assert_false (gtk_tree_sortable_has_default_sort_func (GTK_TREE_SORTABLE (sorted))); gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (sorted), sort_func, NULL, NULL); - g_assert (gtk_tree_sortable_has_default_sort_func (GTK_TREE_SORTABLE (sorted))); + g_assert_true (gtk_tree_sortable_has_default_sort_func (GTK_TREE_SORTABLE (sorted))); gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sorted), 0, sort_func, NULL, NULL); ret = gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (sorted), &col, &order); - g_assert (column_changed == 0); - g_assert (ret == FALSE); - g_assert (col == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID); - g_assert (order == GTK_SORT_ASCENDING); + g_assert_cmpint (column_changed, ==, 0); + g_assert_false (ret); + g_assert_cmpint (col, ==, GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID); + g_assert_cmpint (order, ==, GTK_SORT_ASCENDING); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sorted), GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_DESCENDING); ret = gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (sorted), &col, &order); - g_assert (column_changed == 1); - g_assert (ret == FALSE); - g_assert (col == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID); - g_assert (order == GTK_SORT_DESCENDING); + g_assert_cmpint (column_changed, ==, 1); + g_assert_false (ret); + g_assert_cmpint (col, ==, GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID); + g_assert_cmpint (order, ==, GTK_SORT_DESCENDING); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sorted), GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_DESCENDING); ret = gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (sorted), &col, &order); - g_assert (column_changed == 1); - g_assert (ret == FALSE); - g_assert (col == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID); - g_assert (order == GTK_SORT_DESCENDING); + g_assert_cmpint (column_changed, ==, 1); + g_assert_false (ret); + g_assert_cmpint (col, ==, GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID); + g_assert_cmpint (order, ==, GTK_SORT_DESCENDING); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sorted), 0, GTK_SORT_DESCENDING); ret = gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (sorted), &col, &order); - g_assert (column_changed == 2); - g_assert (ret == TRUE); - g_assert (col == 0); - g_assert (order == GTK_SORT_DESCENDING); + g_assert_cmpint (column_changed, ==, 2); + g_assert_true (ret); + g_assert_cmpint (col, ==, 0); + g_assert_cmpint (order, ==, GTK_SORT_DESCENDING); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sorted), GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING); ret = gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (sorted), &col, &order); - g_assert (column_changed == 3); - g_assert (ret == FALSE); - g_assert (col == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID); - g_assert (order == GTK_SORT_ASCENDING); + g_assert_cmpint (column_changed, ==, 3); + g_assert_false (ret); + g_assert_cmpint (col, ==, GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID); + g_assert_cmpint (order, ==, GTK_SORT_ASCENDING); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sorted), GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, GTK_SORT_ASCENDING); ret = gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (sorted), &col, &order); - g_assert (column_changed == 4); - g_assert (ret == FALSE); - g_assert (col == GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID); - g_assert (order == GTK_SORT_ASCENDING); + g_assert_cmpint (column_changed, ==, 4); + g_assert_false (ret); + g_assert_cmpint (col, ==, GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID); + g_assert_cmpint (order, ==, GTK_SORT_ASCENDING); } /* main */ diff --git a/testsuite/gtk/spinbutton.c b/testsuite/gtk/spinbutton.c index e8e35d9227..f8dbb05848 100644 --- a/testsuite/gtk/spinbutton.c +++ b/testsuite/gtk/spinbutton.c @@ -78,7 +78,7 @@ test_adjustment_null (void) adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spin)); gtk_spin_button_configure (GTK_SPIN_BUTTON (spin), NULL, 1.0, 0); - g_assert (adj == gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spin))); + g_assert_true (adj == gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spin))); gtk_spin_button_set_adjustment (GTK_SPIN_BUTTON (spin), NULL); adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spin)); diff --git a/testsuite/gtk/stringlist.c b/testsuite/gtk/stringlist.c index 93e9720d2c..cf163b8845 100644 --- a/testsuite/gtk/stringlist.c +++ b/testsuite/gtk/stringlist.c @@ -61,7 +61,7 @@ items_changed (GListModel *model, guint added, GString *changes) { - g_assert (removed != 0 || added != 0); + g_assert_true (removed != 0 || added != 0); if (changes->len) g_string_append (changes, ", "); @@ -245,7 +245,7 @@ test_take (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); changes_quark = g_quark_from_static_string ("What did I see? Can I believe what I saw?"); diff --git a/testsuite/gtk/templates.c b/testsuite/gtk/templates.c index 843fd500d9..5911882198 100644 --- a/testsuite/gtk/templates.c +++ b/testsuite/gtk/templates.c @@ -51,8 +51,8 @@ test_dialog_basic (void) GtkWidget *dialog; dialog = gtk_dialog_new (); - g_assert (GTK_IS_DIALOG (dialog)); - g_assert (gtk_dialog_get_content_area (GTK_DIALOG (dialog)) != NULL); + g_assert_true (GTK_IS_DIALOG (dialog)); + g_assert_nonnull (gtk_dialog_get_content_area (GTK_DIALOG (dialog))); gtk_window_destroy (GTK_WINDOW (dialog)); } @@ -65,7 +65,7 @@ test_dialog_override_property (void) dialog = g_object_new (GTK_TYPE_DIALOG, "use-header-bar", 1, NULL); - g_assert (GTK_IS_DIALOG (dialog)); + g_assert_true (GTK_IS_DIALOG (dialog)); gtk_window_destroy (GTK_WINDOW (dialog)); } @@ -79,7 +79,7 @@ test_message_dialog_basic (void) GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "Do it hard !"); - g_assert (GTK_IS_DIALOG (dialog)); + g_assert_true (GTK_IS_DIALOG (dialog)); gtk_window_destroy (GTK_WINDOW (dialog)); } @@ -89,7 +89,7 @@ test_about_dialog_basic (void) GtkWidget *dialog; dialog = gtk_about_dialog_new (); - g_assert (GTK_IS_ABOUT_DIALOG (dialog)); + g_assert_true (GTK_IS_ABOUT_DIALOG (dialog)); gtk_window_destroy (GTK_WINDOW (dialog)); } @@ -99,7 +99,7 @@ test_about_dialog_show (void) GtkWidget *dialog; dialog = gtk_about_dialog_new (); - g_assert (GTK_IS_ABOUT_DIALOG (dialog)); + g_assert_true (GTK_IS_ABOUT_DIALOG (dialog)); show_and_wait (dialog); gtk_window_destroy (GTK_WINDOW (dialog)); } @@ -110,7 +110,7 @@ test_info_bar_basic (void) GtkWidget *infobar; infobar = gtk_info_bar_new (); - g_assert (GTK_IS_INFO_BAR (infobar)); + g_assert_true (GTK_IS_INFO_BAR (infobar)); g_object_unref (g_object_ref_sink (infobar)); } @@ -122,7 +122,7 @@ test_lock_button_basic (void) permission = g_simple_permission_new (TRUE); button = gtk_lock_button_new (permission); - g_assert (GTK_IS_LOCK_BUTTON (button)); + g_assert_true (GTK_IS_LOCK_BUTTON (button)); g_object_unref (g_object_ref_sink (button)); g_object_unref (permission); } @@ -133,7 +133,7 @@ test_assistant_basic (void) GtkWidget *widget; widget = gtk_assistant_new (); - g_assert (GTK_IS_ASSISTANT (widget)); + g_assert_true (GTK_IS_ASSISTANT (widget)); gtk_window_destroy (GTK_WINDOW (widget)); } @@ -143,7 +143,7 @@ test_assistant_show (void) GtkWidget *widget; widget = gtk_assistant_new (); - g_assert (GTK_IS_ASSISTANT (widget)); + g_assert_true (GTK_IS_ASSISTANT (widget)); show_and_wait (widget); gtk_window_destroy (GTK_WINDOW (widget)); } @@ -154,7 +154,7 @@ test_scale_button_basic (void) GtkWidget *widget; widget = gtk_scale_button_new (0, 100, 10, NULL); - g_assert (GTK_IS_SCALE_BUTTON (widget)); + g_assert_true (GTK_IS_SCALE_BUTTON (widget)); g_object_unref (g_object_ref_sink (widget)); } @@ -164,7 +164,7 @@ test_volume_button_basic (void) GtkWidget *widget; widget = gtk_volume_button_new (); - g_assert (GTK_IS_VOLUME_BUTTON (widget)); + g_assert_true (GTK_IS_VOLUME_BUTTON (widget)); g_object_unref (g_object_ref_sink (widget)); } @@ -174,7 +174,7 @@ test_statusbar_basic (void) GtkWidget *widget; widget = gtk_statusbar_new (); - g_assert (GTK_IS_STATUSBAR (widget)); + g_assert_true (GTK_IS_STATUSBAR (widget)); g_object_unref (g_object_ref_sink (widget)); } @@ -184,7 +184,7 @@ test_search_bar_basic (void) GtkWidget *widget; widget = gtk_search_bar_new (); - g_assert (GTK_IS_SEARCH_BAR (widget)); + g_assert_true (GTK_IS_SEARCH_BAR (widget)); g_object_unref (g_object_ref_sink (widget)); } @@ -194,7 +194,7 @@ test_action_bar_basic (void) GtkWidget *widget; widget = gtk_action_bar_new (); - g_assert (GTK_IS_ACTION_BAR (widget)); + g_assert_true (GTK_IS_ACTION_BAR (widget)); g_object_unref (g_object_ref_sink (widget)); } @@ -204,7 +204,7 @@ test_app_chooser_widget_basic (void) GtkWidget *widget; widget = gtk_app_chooser_widget_new (NULL); - g_assert (GTK_IS_APP_CHOOSER_WIDGET (widget)); + g_assert_true (GTK_IS_APP_CHOOSER_WIDGET (widget)); g_object_unref (g_object_ref_sink (widget)); } @@ -215,7 +215,7 @@ test_app_chooser_dialog_basic (void) gboolean done = FALSE; widget = gtk_app_chooser_dialog_new_for_content_type (NULL, 0, "text/plain"); - g_assert (GTK_IS_APP_CHOOSER_DIALOG (widget)); + g_assert_true (GTK_IS_APP_CHOOSER_DIALOG (widget)); /* GtkAppChooserDialog bug, if destroyed before spinning * the main context then app_chooser_online_get_default_ready_cb() @@ -234,7 +234,7 @@ test_color_chooser_dialog_basic (void) /* This test also tests the internal GtkColorEditor widget */ widget = gtk_color_chooser_dialog_new (NULL, NULL); - g_assert (GTK_IS_COLOR_CHOOSER_DIALOG (widget)); + g_assert_true (GTK_IS_COLOR_CHOOSER_DIALOG (widget)); gtk_window_destroy (GTK_WINDOW (widget)); } @@ -245,7 +245,7 @@ test_color_chooser_dialog_show (void) /* This test also tests the internal GtkColorEditor widget */ widget = gtk_color_chooser_dialog_new (NULL, NULL); - g_assert (GTK_IS_COLOR_CHOOSER_DIALOG (widget)); + g_assert_true (GTK_IS_COLOR_CHOOSER_DIALOG (widget)); show_and_wait (widget); gtk_window_destroy (GTK_WINDOW (widget)); } @@ -273,7 +273,7 @@ test_file_chooser_widget_basic (void) g_test_log_set_fatal_handler (ignore_gvfs_warning, NULL); widget = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); - g_assert (GTK_IS_FILE_CHOOSER_WIDGET (widget)); + g_assert_true (GTK_IS_FILE_CHOOSER_WIDGET (widget)); /* XXX BUG: * @@ -304,7 +304,7 @@ test_file_chooser_dialog_basic (void) "_OK", GTK_RESPONSE_OK, NULL); - g_assert (GTK_IS_FILE_CHOOSER_DIALOG (widget)); + g_assert_true (GTK_IS_FILE_CHOOSER_DIALOG (widget)); done = FALSE; g_timeout_add (100, main_loop_quit_cb, &done); while (!done) @@ -325,7 +325,7 @@ test_file_chooser_dialog_show (void) "_OK", GTK_RESPONSE_OK, NULL); - g_assert (GTK_IS_FILE_CHOOSER_DIALOG (widget)); + g_assert_true (GTK_IS_FILE_CHOOSER_DIALOG (widget)); show_and_wait (widget); gtk_window_destroy (GTK_WINDOW (widget)); } @@ -336,7 +336,7 @@ test_font_button_basic (void) GtkWidget *widget; widget = gtk_font_button_new (); - g_assert (GTK_IS_FONT_BUTTON (widget)); + g_assert_true (GTK_IS_FONT_BUTTON (widget)); g_object_unref (g_object_ref_sink (widget)); } @@ -346,7 +346,7 @@ test_font_chooser_widget_basic (void) GtkWidget *widget; widget = gtk_font_chooser_widget_new (); - g_assert (GTK_IS_FONT_CHOOSER_WIDGET (widget)); + g_assert_true (GTK_IS_FONT_CHOOSER_WIDGET (widget)); g_object_unref (g_object_ref_sink (widget)); } @@ -356,7 +356,7 @@ test_font_chooser_dialog_basic (void) GtkWidget *widget; widget = gtk_font_chooser_dialog_new ("Choose a font !", NULL); - g_assert (GTK_IS_FONT_CHOOSER_DIALOG (widget)); + g_assert_true (GTK_IS_FONT_CHOOSER_DIALOG (widget)); gtk_window_destroy (GTK_WINDOW (widget)); } @@ -366,7 +366,7 @@ test_font_chooser_dialog_show (void) GtkWidget *widget; widget = gtk_font_chooser_dialog_new ("Choose a font !", NULL); - g_assert (GTK_IS_FONT_CHOOSER_DIALOG (widget)); + g_assert_true (GTK_IS_FONT_CHOOSER_DIALOG (widget)); show_and_wait (widget); gtk_window_destroy (GTK_WINDOW (widget)); } @@ -378,7 +378,7 @@ test_page_setup_unix_dialog_basic (void) GtkWidget *widget; widget = gtk_page_setup_unix_dialog_new ("Setup your Page !", NULL); - g_assert (GTK_IS_PAGE_SETUP_UNIX_DIALOG (widget)); + g_assert_true (GTK_IS_PAGE_SETUP_UNIX_DIALOG (widget)); gtk_window_destroy (GTK_WINDOW (widget)); } @@ -388,7 +388,7 @@ test_page_setup_unix_dialog_show (void) GtkWidget *widget; widget = gtk_page_setup_unix_dialog_new ("Setup your Page !", NULL); - g_assert (GTK_IS_PAGE_SETUP_UNIX_DIALOG (widget)); + g_assert_true (GTK_IS_PAGE_SETUP_UNIX_DIALOG (widget)); show_and_wait (widget); gtk_window_destroy (GTK_WINDOW (widget)); } @@ -399,7 +399,7 @@ test_print_unix_dialog_basic (void) GtkWidget *widget; widget = gtk_print_unix_dialog_new ("Go Print !", NULL); - g_assert (GTK_IS_PRINT_UNIX_DIALOG (widget)); + g_assert_true (GTK_IS_PRINT_UNIX_DIALOG (widget)); gtk_window_destroy (GTK_WINDOW (widget)); } @@ -409,7 +409,7 @@ test_print_unix_dialog_show (void) GtkWidget *widget; widget = gtk_print_unix_dialog_new ("Go Print !", NULL); - g_assert (GTK_IS_PRINT_UNIX_DIALOG (widget)); + g_assert_true (GTK_IS_PRINT_UNIX_DIALOG (widget)); show_and_wait (widget); gtk_window_destroy (GTK_WINDOW (widget)); } @@ -429,7 +429,7 @@ main (int argc, char **argv) * to assert that all automated compoenents are properly finalized * when a given composite widget is destroyed. */ - g_assert (g_setenv ("GTK_WIDGET_ASSERT_COMPONENTS", "1", TRUE)); + g_assert_true (g_setenv ("GTK_WIDGET_ASSERT_COMPONENTS", "1", TRUE)); g_test_add_func ("/template/GtkDialog/basic", test_dialog_basic); g_test_add_func ("/template/GtkDialog/OverrideProperty", test_dialog_override_property); diff --git a/testsuite/gtk/test-focus-chain.c b/testsuite/gtk/test-focus-chain.c index cffedc1add..14418519d4 100644 --- a/testsuite/gtk/test-focus-chain.c +++ b/testsuite/gtk/test-focus-chain.c @@ -201,7 +201,7 @@ load_ui_file (GFile *ui_file, builder = gtk_builder_new_from_file (ui_path); window = GTK_WIDGET (gtk_builder_get_object (builder, "window")); - g_assert (window != NULL); + g_assert_nonnull (window); gtk_widget_show (window); @@ -235,7 +235,7 @@ load_ui_file (GFile *ui_file, goto out; } - g_assert (ref_file != NULL); + g_assert_nonnull (ref_file); ref_path = g_file_get_path (ref_file); @@ -289,7 +289,7 @@ main (int argc, char **argv) if (arg_generate) { - g_assert (argc == 2); + g_assert_cmpint (argc, ==, 2); ui_file = g_file_new_for_commandline_arg (argv[1]); @@ -299,7 +299,7 @@ main (int argc, char **argv) } else { - g_assert (argc == 3); + g_assert_cmpint (argc, ==, 3); ui_file = g_file_new_for_commandline_arg (argv[1]); ref_file = g_file_new_for_commandline_arg (argv[2]); diff --git a/testsuite/gtk/textbuffer.c b/testsuite/gtk/textbuffer.c index 485571f568..ff6d3c95f2 100644 --- a/testsuite/gtk/textbuffer.c +++ b/testsuite/gtk/textbuffer.c @@ -678,7 +678,7 @@ fill_buffer (GtkTextBuffer *buffer) pixbuf = gdk_pixbuf_new_from_xpm_data (book_closed_xpm); texture = gdk_texture_new_for_pixbuf (pixbuf); - g_assert (texture != NULL); + g_assert_nonnull (texture); for (i = 0; i < 10; i++) { @@ -816,38 +816,38 @@ test_line_separation (const char* str, gtk_text_buffer_set_text (buffer, str, -1); gtk_text_buffer_get_iter_at_offset (buffer, &iter, expected_line_break); - g_assert (gtk_text_iter_ends_line (&iter) || gtk_text_iter_is_end (&iter)); + g_assert_true (gtk_text_iter_ends_line (&iter) || gtk_text_iter_is_end (&iter)); - g_assert (gtk_text_buffer_get_line_count (buffer) == expected_line_count); + g_assert_cmpint (gtk_text_buffer_get_line_count (buffer), ==, expected_line_count); on_next_line = gtk_text_iter_forward_line (&iter); - g_assert (expect_next_line == on_next_line); + g_assert_cmpint (expect_next_line, ==, on_next_line); on_end_iter = gtk_text_iter_is_end (&iter); - g_assert (on_end_iter == expect_end_iter); + g_assert_true (on_end_iter == expect_end_iter); new_pos = gtk_text_iter_get_offset (&iter); if (on_next_line) - g_assert (expected_next_line_start == new_pos); + g_assert_cmpint (expected_next_line_start, ==, new_pos); ++expected_line_break; while (expected_line_break < expected_next_line_start) { gtk_text_buffer_get_iter_at_offset (buffer, &iter, expected_line_break); - g_assert (!gtk_text_iter_ends_line (&iter)); + g_assert_false (gtk_text_iter_ends_line (&iter)); on_next_line = gtk_text_iter_forward_line (&iter); - g_assert (expect_next_line == on_next_line); + g_assert_cmpint (expect_next_line, ==, on_next_line); new_pos = gtk_text_iter_get_offset (&iter); if (on_next_line) - g_assert (expected_next_line_start == new_pos); + g_assert_cmpint (expected_next_line_start, ==, new_pos); ++expected_line_break; } @@ -880,10 +880,10 @@ split_r_n_separators_test (void) gtk_text_buffer_get_iter_at_offset (buffer, &iter, 5); gtk_text_buffer_backspace (buffer, &iter, TRUE, TRUE); - g_assert (gtk_text_iter_ends_line (&iter)); + g_assert_true (gtk_text_iter_ends_line (&iter)); gtk_text_buffer_get_iter_at_offset (buffer, &iter, 3); - g_assert (gtk_text_iter_ends_line (&iter)); + g_assert_true (gtk_text_iter_ends_line (&iter)); g_object_unref (buffer); } @@ -931,14 +931,14 @@ test_backspace (void) gtk_text_buffer_set_text (buffer, "foo", -1); gtk_text_buffer_get_iter_at_offset (buffer, &iter, 2); ret = gtk_text_buffer_backspace (buffer, &iter, TRUE, TRUE); - g_assert (ret); + g_assert_true (ret); g_assert_cmpint (1, ==, gtk_text_iter_get_offset (&iter)); g_assert_cmpint (2, ==, gtk_text_buffer_get_char_count (buffer)); gtk_text_buffer_set_text (buffer, "foo", -1); gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0); ret = gtk_text_buffer_backspace (buffer, &iter, TRUE, TRUE); - g_assert (!ret); + g_assert_true (!ret); g_assert_cmpint (0, ==, gtk_text_iter_get_offset (&iter)); g_assert_cmpint (3, ==, gtk_text_buffer_get_char_count (buffer)); @@ -946,7 +946,7 @@ test_backspace (void) gtk_text_buffer_set_text (buffer, "foo\r\n\r\nbar", -1); gtk_text_buffer_get_iter_at_offset (buffer, &iter, 5); ret = gtk_text_buffer_backspace (buffer, &iter, TRUE, TRUE); - g_assert (ret); + g_assert_true (ret); g_assert_cmpint (0, ==, gtk_text_iter_get_line (&iter)); g_assert_cmpint (8, ==, gtk_text_buffer_get_char_count (buffer)); @@ -954,21 +954,21 @@ test_backspace (void) gtk_text_buffer_set_text (buffer, "", -1); gtk_text_buffer_get_end_iter (buffer, &iter); ret = gtk_text_buffer_backspace (buffer, &iter, TRUE, TRUE); - g_assert (!ret); + g_assert_false (ret); g_assert_cmpint (0, ==, gtk_text_iter_get_offset (&iter)); g_assert_cmpint (0, ==, gtk_text_buffer_get_char_count (buffer)); gtk_text_buffer_set_text (buffer, "foo\n", -1); gtk_text_buffer_get_end_iter (buffer, &iter); ret = gtk_text_buffer_backspace (buffer, &iter, TRUE, TRUE); - g_assert (ret); + g_assert_true (ret); g_assert_cmpint (3, ==, gtk_text_iter_get_offset (&iter)); g_assert_cmpint (3, ==, gtk_text_buffer_get_char_count (buffer)); gtk_text_buffer_set_text (buffer, "foo\r\n", -1); gtk_text_buffer_get_end_iter (buffer, &iter); ret = gtk_text_buffer_backspace (buffer, &iter, TRUE, TRUE); - g_assert (ret); + g_assert_true (ret); g_assert_cmpint (3, ==, gtk_text_iter_get_offset (&iter)); g_assert_cmpint (3, ==, gtk_text_buffer_get_char_count (buffer)); @@ -1178,25 +1178,25 @@ test_marks (void) gtk_text_mark_set_visible (mark, TRUE); gtk_text_buffer_delete_mark (buf1, mark); - g_assert (gtk_text_mark_get_visible (mark)); - g_assert (gtk_text_mark_get_left_gravity (mark)); - g_assert (!strcmp ("foo", gtk_text_mark_get_name (mark))); - g_assert (gtk_text_mark_get_buffer (mark) == NULL); - g_assert (gtk_text_mark_get_deleted (mark)); - g_assert (gtk_text_buffer_get_mark (buf1, "foo") == NULL); + g_assert_true (gtk_text_mark_get_visible (mark)); + g_assert_true (gtk_text_mark_get_left_gravity (mark)); + g_assert_cmpstr ("foo", ==, gtk_text_mark_get_name (mark)); + g_assert_null (gtk_text_mark_get_buffer (mark)); + g_assert_true (gtk_text_mark_get_deleted (mark)); + g_assert_null (gtk_text_buffer_get_mark (buf1, "foo")); gtk_text_buffer_get_start_iter (buf2, &iter); gtk_text_buffer_add_mark (buf2, mark, &iter); gtk_text_buffer_insert (buf2, &iter, "ewfwefwefwe", -1); gtk_text_buffer_get_iter_at_mark (buf2, &iter, mark); - g_assert (gtk_text_mark_get_visible (mark)); - g_assert (gtk_text_iter_is_start (&iter)); - g_assert (gtk_text_mark_get_left_gravity (mark)); - g_assert (!strcmp ("foo", gtk_text_mark_get_name (mark))); - g_assert (gtk_text_mark_get_buffer (mark) == buf2); - g_assert (!gtk_text_mark_get_deleted (mark)); - g_assert (gtk_text_buffer_get_mark (buf2, "foo") == mark); + g_assert_true (gtk_text_mark_get_visible (mark)); + g_assert_true (gtk_text_iter_is_start (&iter)); + g_assert_true (gtk_text_mark_get_left_gravity (mark)); + g_assert_cmpstr ("foo", ==, gtk_text_mark_get_name (mark)); + g_assert_true (gtk_text_mark_get_buffer (mark) == buf2); + g_assert_false (gtk_text_mark_get_deleted (mark)); + g_assert_true (gtk_text_buffer_get_mark (buf2, "foo") == mark); gtk_text_buffer_delete_mark (buf2, mark); gtk_text_mark_set_visible (mark, FALSE); @@ -1207,25 +1207,25 @@ test_marks (void) gtk_text_mark_set_visible (mark, TRUE); gtk_text_buffer_add_mark (buf1, mark, &iter); - g_assert (gtk_text_mark_get_visible (mark)); - g_assert (gtk_text_mark_get_buffer (mark) == buf1); - g_assert (!gtk_text_mark_get_deleted (mark)); - g_assert (gtk_text_buffer_get_mark (buf1, "blah") == mark); - g_assert (!strcmp ("blah", gtk_text_mark_get_name (mark))); + g_assert_true (gtk_text_mark_get_visible (mark)); + g_assert_true (gtk_text_mark_get_buffer (mark) == buf1); + g_assert_false (gtk_text_mark_get_deleted (mark)); + g_assert_true (gtk_text_buffer_get_mark (buf1, "blah") == mark); + g_assert_cmpstr ("blah", ==, gtk_text_mark_get_name (mark)); gtk_text_mark_set_visible (mark, FALSE); gtk_text_buffer_delete_mark (buf1, mark); - g_assert (!gtk_text_mark_get_visible (mark)); - g_assert (gtk_text_buffer_get_mark (buf1, "blah") == NULL); - g_assert (gtk_text_mark_get_buffer (mark) == NULL); - g_assert (gtk_text_mark_get_deleted (mark)); + g_assert_false (gtk_text_mark_get_visible (mark)); + g_assert_null (gtk_text_buffer_get_mark (buf1, "blah")); + g_assert_null (gtk_text_mark_get_buffer (mark)); + g_assert_true (gtk_text_mark_get_deleted (mark)); gtk_text_buffer_get_start_iter (buf2, &iter); gtk_text_buffer_add_mark (buf2, mark, &iter); - g_assert (gtk_text_mark_get_buffer (mark) == buf2); - g_assert (!gtk_text_mark_get_deleted (mark)); - g_assert (gtk_text_buffer_get_mark (buf2, "blah") == mark); - g_assert (!strcmp ("blah", gtk_text_mark_get_name (mark))); + g_assert_true (gtk_text_mark_get_buffer (mark) == buf2); + g_assert_false (gtk_text_mark_get_deleted (mark)); + g_assert_true (gtk_text_buffer_get_mark (buf2, "blah") == mark); + g_assert_cmpstr ("blah", ==, gtk_text_mark_get_name (mark)); g_object_unref (mark); g_object_unref (buf1); @@ -1238,10 +1238,10 @@ test_utf8 (void) gunichar ch; /* Check UTF8 unknown char thing */ - g_assert (GTK_TEXT_UNKNOWN_CHAR_UTF8_LEN == 3); - g_assert (g_utf8_strlen (gtk_text_unknown_char_utf8_gtk_tests_only (), 3) == 1); + g_assert_cmpint (GTK_TEXT_UNKNOWN_CHAR_UTF8_LEN, ==, 3); + g_assert_cmpint (g_utf8_strlen (gtk_text_unknown_char_utf8_gtk_tests_only (), 3), ==, 1); ch = g_utf8_get_char (gtk_text_unknown_char_utf8_gtk_tests_only ()); - g_assert (ch == GTK_TEXT_UNKNOWN_CHAR); + g_assert_true (ch == GTK_TEXT_UNKNOWN_CHAR); } static void @@ -1453,7 +1453,7 @@ test_clipboard (void) check_buffer_contents (buffer, "abcdef"); gtk_text_buffer_get_iter_at_offset (buffer, &start, 3); - g_assert (gtk_text_iter_forward_to_tag_toggle (&start, tag)); + g_assert_true (gtk_text_iter_forward_to_tag_toggle (&start, tag)); g_assert_cmpint (4, ==, gtk_text_iter_get_offset (&start)); g_object_unref (buffer); @@ -1472,93 +1472,93 @@ test_get_iter (void) gtk_text_buffer_set_text (buffer, "ab\nßd\r\nef", -1); /* Test get_iter_at_line() */ - g_assert (gtk_text_buffer_get_iter_at_line (buffer, &iter, 0)); - g_assert (gtk_text_iter_is_start (&iter)); + g_assert_true (gtk_text_buffer_get_iter_at_line (buffer, &iter, 0)); + g_assert_true (gtk_text_iter_is_start (&iter)); - g_assert (gtk_text_buffer_get_iter_at_line (buffer, &iter, 1)); + g_assert_true (gtk_text_buffer_get_iter_at_line (buffer, &iter, 1)); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 3); - g_assert (gtk_text_buffer_get_iter_at_line (buffer, &iter, 2)); + g_assert_true (gtk_text_buffer_get_iter_at_line (buffer, &iter, 2)); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 7); - g_assert (!gtk_text_buffer_get_iter_at_line (buffer, &iter, 3)); - g_assert (gtk_text_iter_is_end (&iter)); + g_assert_false (gtk_text_buffer_get_iter_at_line (buffer, &iter, 3)); + g_assert_true (gtk_text_iter_is_end (&iter)); /* Test get_iter_at_line_offset() */ - g_assert (gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 0, 0)); - g_assert (gtk_text_iter_is_start (&iter)); + g_assert_true (gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 0, 0)); + g_assert_true (gtk_text_iter_is_start (&iter)); - g_assert (gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 0, 1)); + g_assert_true (gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 0, 1)); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 1); - g_assert (gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 0, 2)); + g_assert_true (gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 0, 2)); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 2); - g_assert (!gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 0, 3)); + g_assert_false (gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 0, 3)); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 2); - g_assert (gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 1, 1)); + g_assert_true (gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 1, 1)); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 4); - g_assert (gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 2, 1)); + g_assert_true (gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 2, 1)); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 8); - g_assert (gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 2, 2)); - g_assert (gtk_text_iter_is_end (&iter)); + g_assert_true (gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 2, 2)); + g_assert_true (gtk_text_iter_is_end (&iter)); - g_assert (!gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 2, 3)); - g_assert (gtk_text_iter_is_end (&iter)); + g_assert_false (gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 2, 3)); + g_assert_true (gtk_text_iter_is_end (&iter)); - g_assert (!gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 3, 1)); - g_assert (gtk_text_iter_is_end (&iter)); + g_assert_false (gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 3, 1)); + g_assert_true (gtk_text_iter_is_end (&iter)); /* Test get_iter_at_line_index() */ - g_assert (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 0, 0)); - g_assert (gtk_text_iter_is_start (&iter)); + g_assert_true (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 0, 0)); + g_assert_true (gtk_text_iter_is_start (&iter)); - g_assert (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 0, 1)); + g_assert_true (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 0, 1)); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 1); - g_assert (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 0, 2)); + g_assert_true (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 0, 2)); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 2); - g_assert (!gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 0, 3)); + g_assert_false (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 0, 3)); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 2); - g_assert (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 1, 0)); + g_assert_true (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 1, 0)); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 3); - g_assert (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 1, 2)); + g_assert_true (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 1, 2)); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 4); - g_assert (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 1, 3)); + g_assert_true (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 1, 3)); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 5); - g_assert (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 2, 2)); - g_assert (gtk_text_iter_is_end (&iter)); + g_assert_true (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 2, 2)); + g_assert_true (gtk_text_iter_is_end (&iter)); - g_assert (!gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 2, 3)); - g_assert (gtk_text_iter_is_end (&iter)); + g_assert_false (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 2, 3)); + g_assert_true (gtk_text_iter_is_end (&iter)); - g_assert (!gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 3, 1)); - g_assert (gtk_text_iter_is_end (&iter)); + g_assert_false (gtk_text_buffer_get_iter_at_line_index (buffer, &iter, 3, 1)); + g_assert_true (gtk_text_iter_is_end (&iter)); /* Test get_iter_at_offset() */ gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0); - g_assert (gtk_text_iter_is_start (&iter)); + g_assert_true (gtk_text_iter_is_start (&iter)); gtk_text_buffer_get_iter_at_offset (buffer, &iter, 1); offset = gtk_text_iter_get_offset (&iter); @@ -1567,16 +1567,16 @@ test_get_iter (void) gtk_text_buffer_get_iter_at_offset (buffer, &iter, 8); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 8); - g_assert (!gtk_text_iter_is_end (&iter)); + g_assert_false (gtk_text_iter_is_end (&iter)); gtk_text_buffer_get_iter_at_offset (buffer, &iter, 9); - g_assert (gtk_text_iter_is_end (&iter)); + g_assert_true (gtk_text_iter_is_end (&iter)); gtk_text_buffer_get_iter_at_offset (buffer, &iter, 100); - g_assert (gtk_text_iter_is_end (&iter)); + g_assert_true (gtk_text_iter_is_end (&iter)); gtk_text_buffer_get_iter_at_offset (buffer, &iter, -1); - g_assert (gtk_text_iter_is_end (&iter)); + g_assert_true (gtk_text_iter_is_end (&iter)); g_object_unref (buffer); } diff --git a/testsuite/gtk/textiter.c b/testsuite/gtk/textiter.c index 08d5894b13..8b296b222b 100644 --- a/testsuite/gtk/textiter.c +++ b/testsuite/gtk/textiter.c @@ -34,14 +34,14 @@ test_empty_search (void) /* search from start forward */ gtk_text_buffer_get_start_iter (buffer, &it); res = gtk_text_iter_forward_search (&it, "", 0, &s, &e, NULL); - g_assert (res); + g_assert_true (res); g_assert_cmpint (gtk_text_iter_get_offset (&s), ==, gtk_text_iter_get_offset (&e)); g_assert_cmpint (gtk_text_iter_get_offset (&s), ==, 1); /* search from end backward */ gtk_text_buffer_get_end_iter (buffer, &it); res = gtk_text_iter_backward_search (&it, "", 0, &s, &e, NULL); - g_assert (res); + g_assert_true (res); g_assert_cmpint (gtk_text_iter_get_offset (&s), ==, gtk_text_iter_get_offset (&e)); g_assert_cmpint (gtk_text_iter_get_offset (&s), ==, 20); } @@ -69,7 +69,7 @@ check_found_forward (const char *haystack, /* search from start forward */ gtk_text_buffer_get_start_iter (buffer, &i); res = gtk_text_iter_forward_search (&i, needle, flags, &s, &e, NULL); - g_assert (res); + g_assert_true (res); g_assert_cmpint (expected_start, ==, gtk_text_iter_get_offset (&s)); g_assert_cmpint (expected_end, ==, gtk_text_iter_get_offset (&e)); text = gtk_text_iter_get_text (&s, &e); @@ -99,7 +99,7 @@ check_found_backward (const char *haystack, /* search from end backward */ gtk_text_buffer_get_end_iter (buffer, &i); res = gtk_text_iter_backward_search (&i, needle, flags, &s, &e, NULL); - g_assert (res); + g_assert_true (res); g_assert_cmpint (expected_start, ==, gtk_text_iter_get_offset (&s)); g_assert_cmpint (expected_end, ==, gtk_text_iter_get_offset (&e)); text = gtk_text_iter_get_text (&s, &e); @@ -125,12 +125,12 @@ check_not_found (const char *haystack, /* search from start forward */ gtk_text_buffer_get_start_iter (buffer, &i); res = gtk_text_iter_forward_search (&i, needle, flags, &s, &e, NULL); - g_assert (res == FALSE); + g_assert_false (res); /* search from end backward */ gtk_text_buffer_get_end_iter (buffer, &i); res = gtk_text_iter_backward_search (&i, needle, flags, &s, &e, NULL); - g_assert (res == FALSE); + g_assert_false (res); g_object_unref (buffer); } @@ -287,6 +287,7 @@ test_forward_to_tag_toggle (void) GtkTextTag *editable_tag; GtkTextIter iter; int offset; + gboolean ret; buffer = gtk_text_buffer_new (NULL); @@ -306,26 +307,31 @@ test_forward_to_tag_toggle (void) /* Go to the first "on" toggle */ gtk_text_buffer_get_start_iter (buffer, &iter); - g_assert (gtk_text_iter_forward_to_tag_toggle (&iter, NULL)); + ret = gtk_text_iter_forward_to_tag_toggle (&iter, NULL); + g_assert_true (ret); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 1); /* Go to the last "off" toggle for the bold tag */ - g_assert (gtk_text_iter_forward_to_tag_toggle (&iter, bold_tag)); + ret = gtk_text_iter_forward_to_tag_toggle (&iter, bold_tag); + g_assert_true (ret); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 2); - g_assert (!gtk_text_iter_forward_to_tag_toggle (&iter, bold_tag)); + ret = gtk_text_iter_forward_to_tag_toggle (&iter, bold_tag); + g_assert_false (ret); /* Go to the first "on" toggle for the editable tag */ gtk_text_buffer_get_start_iter (buffer, &iter); - g_assert (gtk_text_iter_forward_to_tag_toggle (&iter, editable_tag)); + ret = gtk_text_iter_forward_to_tag_toggle (&iter, editable_tag); + g_assert_true (ret); offset = gtk_text_iter_get_offset (&iter); g_assert_cmpint (offset, ==, 2); /* Test with the end iter */ gtk_text_buffer_get_end_iter (buffer, &iter); - g_assert (!gtk_text_iter_forward_to_tag_toggle (&iter, editable_tag)); + ret = gtk_text_iter_forward_to_tag_toggle (&iter, editable_tag); + g_assert_false (ret); g_object_unref (buffer); } diff --git a/testsuite/gtk/theme-validate.c b/testsuite/gtk/theme-validate.c index e2e51e5852..5e7669c9fa 100644 --- a/testsuite/gtk/theme-validate.c +++ b/testsuite/gtk/theme-validate.c @@ -50,7 +50,7 @@ main (int argc, char *argv[]) guint i; gtk_init (); - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); for (i = 0; i < G_N_ELEMENTS (themes); i++) { diff --git a/testsuite/gtk/timsort.c b/testsuite/gtk/timsort.c index f7930259f7..d8aba88698 100644 --- a/testsuite/gtk/timsort.c +++ b/testsuite/gtk/timsort.c @@ -74,7 +74,7 @@ run_comparison (gpointer a, gint64 start, mid, end; gpointer b; - g_assert (n <= G_MAXSIZE / element_size); + g_assert_cmpint (n, <=, G_MAXSIZE / element_size); b = g_memdup2 (a, element_size * n); @@ -245,7 +245,7 @@ test_steps (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); g_test_add_func ("/timsort/integers", test_integers); diff --git a/testsuite/gtk/treelistmodel.c b/testsuite/gtk/treelistmodel.c index 14bc09dc62..0ea7a37b6c 100644 --- a/testsuite/gtk/treelistmodel.c +++ b/testsuite/gtk/treelistmodel.c @@ -30,7 +30,7 @@ get (GListModel *model, { GObject *object = g_list_model_get_item (model, position); guint number; - g_assert (object != NULL); + g_assert_nonnull (object); number = GPOINTER_TO_UINT (g_object_get_qdata (object, number_quark)); g_object_unref (object); return number; @@ -65,7 +65,7 @@ prepend (GListStore *store, GObject *object; /* 0 cannot be differentiated from NULL, so don't use it */ - g_assert (number != 0); + g_assert_cmpint (number, !=, 0); if (step / 10) object = G_OBJECT (new_store (number - 9 * step / 10, number, step / 10)); @@ -119,7 +119,7 @@ items_changed (GListModel *model, guint added, GString *changes) { - g_assert (removed != 0 || added != 0); + g_assert_true (removed != 0 || added != 0); if (changes->len) g_string_append (changes, ", "); @@ -226,25 +226,25 @@ test_remove_some (void) assert_changes (tree, ""); item = g_list_model_get_item (G_LIST_MODEL (tree), 1); - g_assert (G_IS_LIST_MODEL (item)); + g_assert_true (G_IS_LIST_MODEL (item)); g_list_store_remove (item, 3); assert_model (tree, "100 100 100 99 98 96 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 70 70 69 68 67 66 65 64 63 62 61 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1"); assert_changes (tree, "-5"); item = g_list_model_get_item (G_LIST_MODEL (tree), 0); - g_assert (G_IS_LIST_MODEL (item)); + g_assert_true (G_IS_LIST_MODEL (item)); g_list_store_remove (item, 3); assert_model (tree, "100 100 100 99 98 96 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2 1"); assert_changes (tree, "33-11"); item = g_list_model_get_item (G_LIST_MODEL (tree), 88); - g_assert (G_IS_LIST_MODEL (item)); + g_assert_true (G_IS_LIST_MODEL (item)); g_list_store_remove (item, 9); assert_model (tree, "100 100 100 99 98 96 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11 10 10 9 8 7 6 5 4 3 2"); assert_changes (tree, "-98"); item = g_list_model_get_item (G_LIST_MODEL (tree), 0); - g_assert (G_IS_LIST_MODEL (item)); + g_assert_true (G_IS_LIST_MODEL (item)); g_list_store_remove (item, 8); assert_model (tree, "100 100 100 99 98 96 95 94 93 92 91 90 90 89 88 87 86 85 84 83 82 81 80 80 79 78 77 76 75 74 73 72 71 60 60 59 58 57 56 55 54 53 52 51 50 50 49 48 47 46 45 44 43 42 41 40 40 39 38 37 36 35 34 33 32 31 30 30 29 28 27 26 25 24 23 22 21 20 20 19 18 17 16 15 14 13 12 11"); assert_changes (tree, "88-10"); @@ -255,7 +255,7 @@ test_remove_some (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); number_quark = g_quark_from_static_string ("Hell and fire was spawned to be released."); diff --git a/testsuite/gtk/treemodel.c b/testsuite/gtk/treemodel.c index b0018edfda..3a0c0bc3ec 100644 --- a/testsuite/gtk/treemodel.c +++ b/testsuite/gtk/treemodel.c @@ -183,13 +183,13 @@ signal_monitor_generic_handler (SignalMonitor *m, { int i, len; - g_assert (new_order != NULL); + g_assert_nonnull (new_order); len = gtk_tree_model_iter_n_children (model, iter); - g_assert (s->len == len); + g_assert_cmpint (s->len, ==, len); for (i = 0; i < len; i++) - g_assert (s->new_order[i] == new_order[i]); + g_assert_cmpint (s->new_order[i], ==, new_order[i]); } s = g_queue_pop_tail (m->queue); @@ -299,7 +299,7 @@ signal_monitor_free (SignalMonitor *m) void signal_monitor_assert_is_empty (SignalMonitor *m) { - g_assert (g_queue_is_empty (m->queue)); + g_assert_true (g_queue_is_empty (m->queue)); } void diff --git a/testsuite/gtk/treepath.c b/testsuite/gtk/treepath.c index 147ac64e43..1f2fb7688f 100644 --- a/testsuite/gtk/treepath.c +++ b/testsuite/gtk/treepath.c @@ -118,7 +118,7 @@ test_navigation (void) p = gtk_tree_path_new_from_indices (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1); q = gtk_tree_path_copy (p); - g_assert (gtk_tree_path_compare (p, q) == 0); + g_assert_true (gtk_tree_path_compare (p, q) == 0); gtk_tree_path_next (q); pi = gtk_tree_path_get_indices (p); qi = gtk_tree_path_get_indices (q); @@ -126,39 +126,39 @@ test_navigation (void) g_assert_cmpint (pi[i], ==, qi[i]); g_assert_cmpint (qi[9], ==, pi[9] + 1); - g_assert (!gtk_tree_path_is_ancestor (p, q)); - g_assert (!gtk_tree_path_is_ancestor (q, p)); - g_assert (!gtk_tree_path_is_descendant (p, q)); - g_assert (!gtk_tree_path_is_descendant (q, p)); + g_assert_false (gtk_tree_path_is_ancestor (p, q)); + g_assert_false (gtk_tree_path_is_ancestor (q, p)); + g_assert_false (gtk_tree_path_is_descendant (p, q)); + g_assert_false (gtk_tree_path_is_descendant (q, p)); res = gtk_tree_path_prev (q); - g_assert (res); - g_assert (gtk_tree_path_compare (p, q) == 0); + g_assert_true (res); + g_assert_true (gtk_tree_path_compare (p, q) == 0); - g_assert (!gtk_tree_path_is_ancestor (p, q)); - g_assert (!gtk_tree_path_is_ancestor (q, p)); - g_assert (!gtk_tree_path_is_descendant (p, q)); - g_assert (!gtk_tree_path_is_descendant (q, p)); + g_assert_false (gtk_tree_path_is_ancestor (p, q)); + g_assert_false (gtk_tree_path_is_ancestor (q, p)); + g_assert_false (gtk_tree_path_is_descendant (p, q)); + g_assert_false (gtk_tree_path_is_descendant (q, p)); gtk_tree_path_down (q); - g_assert (gtk_tree_path_compare (p, q) < 0); + g_assert_true (gtk_tree_path_compare (p, q) < 0); - g_assert (gtk_tree_path_is_ancestor (p, q)); - g_assert (!gtk_tree_path_is_ancestor (q, p)); - g_assert (!gtk_tree_path_is_descendant (p, q)); - g_assert (gtk_tree_path_is_descendant (q, p)); + g_assert_true (gtk_tree_path_is_ancestor (p, q)); + g_assert_false (gtk_tree_path_is_ancestor (q, p)); + g_assert_false (gtk_tree_path_is_descendant (p, q)); + g_assert_true (gtk_tree_path_is_descendant (q, p)); res = gtk_tree_path_prev (q); - g_assert (!res); + g_assert_false (res); res = gtk_tree_path_up (q); - g_assert (res); - g_assert (gtk_tree_path_compare (p, q) == 0); + g_assert_true (res); + g_assert_true (gtk_tree_path_compare (p, q) == 0); g_assert_cmpint (gtk_tree_path_get_depth (q), ==, 10); res = gtk_tree_path_up (q); - g_assert (res); + g_assert_true (res); g_assert_cmpint (gtk_tree_path_get_depth (q), ==, 9); gtk_tree_path_free (p); diff --git a/testsuite/gtk/treesorter.c b/testsuite/gtk/treesorter.c index 650cfa39fb..ca4245a095 100644 --- a/testsuite/gtk/treesorter.c +++ b/testsuite/gtk/treesorter.c @@ -87,7 +87,7 @@ add (GListStore *store, GObject *object; /* 0 cannot be differentiated from NULL, so don't use it */ - g_assert (number != 0); + g_assert_cmpint (number, !=, 0); object = g_object_new (G_TYPE_OBJECT, NULL); g_object_set_qdata (object, number_quark, GUINT_TO_POINTER (number)); @@ -251,7 +251,7 @@ test_compare_no_order (void) int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); setlocale (LC_ALL, "C"); number_quark = g_quark_from_static_string ("Like a trashcan fire in a prison cell"); diff --git a/testsuite/gtk/treestore.c b/testsuite/gtk/treestore.c index af1d651695..3b3e2ef043 100644 --- a/testsuite/gtk/treestore.c +++ b/testsuite/gtk/treestore.c @@ -128,8 +128,8 @@ check_model (TreeStore *fixture, gtk_tree_model_get_iter (GTK_TREE_MODEL (fixture->store), &iter, path); - g_assert (gtk_tree_store_iter_is_valid (fixture->store, &iter)); - g_assert (iters_equal (&iter, &fixture->iter[new_order[i]])); + g_assert_true (gtk_tree_store_iter_is_valid (fixture->store, &iter)); + g_assert_true (iters_equal (&iter, &fixture->iter[new_order[i]])); gtk_tree_path_next (path); } @@ -148,36 +148,36 @@ tree_store_test_insert_high_values (void) store = gtk_tree_store_new (1, G_TYPE_INT); gtk_tree_store_insert (store, &iter, NULL, 1234); - g_assert (gtk_tree_store_iter_is_valid (store, &iter)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 1); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_store_iter_is_valid (store, &iter)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 1); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); gtk_tree_store_insert (store, &iter2, NULL, 765); - g_assert (gtk_tree_store_iter_is_valid (store, &iter2)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 2); + g_assert_true (gtk_tree_store_iter_is_valid (store, &iter2)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 2); /* Walk over the model */ - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 1)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 1)); - g_assert (!gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 1)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 1)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); - g_assert (!gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); g_object_unref (store); } @@ -192,36 +192,36 @@ tree_store_test_append (void) store = gtk_tree_store_new (1, G_TYPE_INT); gtk_tree_store_append (store, &iter, NULL); - g_assert (gtk_tree_store_iter_is_valid (store, &iter)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 1); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_store_iter_is_valid (store, &iter)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 1); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); gtk_tree_store_append (store, &iter2, NULL); - g_assert (gtk_tree_store_iter_is_valid (store, &iter2)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 2); + g_assert_true (gtk_tree_store_iter_is_valid (store, &iter2)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 2); /* Walk over the model */ - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 1)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 1)); - g_assert (!gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 1)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 1)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); - g_assert (!gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); g_object_unref (store); } @@ -236,36 +236,36 @@ tree_store_test_prepend (void) store = gtk_tree_store_new (1, G_TYPE_INT); gtk_tree_store_prepend (store, &iter, NULL); - g_assert (gtk_tree_store_iter_is_valid (store, &iter)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 1); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_store_iter_is_valid (store, &iter)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 1); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); gtk_tree_store_prepend (store, &iter2, NULL); - g_assert (gtk_tree_store_iter_is_valid (store, &iter2)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 2); + g_assert_true (gtk_tree_store_iter_is_valid (store, &iter2)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 2); /* Walk over the model */ - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 0)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 0)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 1)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 1)); - g_assert (!gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 1)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 1)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 0)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 0)); - g_assert (!gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); g_object_unref (store); } @@ -283,40 +283,40 @@ tree_store_test_insert_after (void) gtk_tree_store_append (store, &iter2, NULL); gtk_tree_store_insert_after (store, &iter3, NULL, &iter); - g_assert (gtk_tree_store_iter_is_valid (store, &iter3)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 3); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); - g_assert (iters_equal (&iter3, &iter_copy)); - g_assert (iter_position (store, &iter3, 1)); + g_assert_true (gtk_tree_store_iter_is_valid (store, &iter3)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 3); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); + g_assert_true (iters_equal (&iter3, &iter_copy)); + g_assert_true (iter_position (store, &iter3, 1)); /* Walk over the model */ - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter_copy, 0)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter_copy, 0)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter3, &iter_copy)); - g_assert (iter_position (store, &iter_copy, 1)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter3, &iter_copy)); + g_assert_true (iter_position (store, &iter_copy, 1)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter_copy, 2)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter_copy, 2)); - g_assert (!gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 2)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 2)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 2)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 2)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter3, &iter_copy)); - g_assert (iter_position (store, &iter3, 1)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter3, &iter_copy)); + g_assert_true (iter_position (store, &iter3, 1)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); - g_assert (!gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); g_object_unref (store); } @@ -334,32 +334,32 @@ tree_store_test_insert_after_NULL (void) /* move_after NULL is basically a prepend */ gtk_tree_store_insert_after (store, &iter2, NULL, NULL); - g_assert (gtk_tree_store_iter_is_valid (store, &iter2)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 2); + g_assert_true (gtk_tree_store_iter_is_valid (store, &iter2)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 2); /* Walk over the model */ - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 0)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 0)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 1)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 1)); - g_assert (!gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 0)); - g_assert (iters_equal (&iter2, &iter_copy)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 0)); + g_assert_true (iters_equal (&iter2, &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 1)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 1)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 0)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 0)); - g_assert (!gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); g_object_unref (store); } @@ -377,43 +377,43 @@ tree_store_test_insert_before (void) gtk_tree_store_append (store, &iter2, NULL); gtk_tree_store_insert_before (store, &iter3, NULL, &iter2); - g_assert (gtk_tree_store_iter_is_valid (store, &iter3)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 3); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); - g_assert (iters_equal (&iter3, &iter_copy)); - g_assert (iter_position (store, &iter3, 1)); + g_assert_true (gtk_tree_store_iter_is_valid (store, &iter3)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 3); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); + g_assert_true (iters_equal (&iter3, &iter_copy)); + g_assert_true (iter_position (store, &iter3, 1)); /* Walk over the model */ - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter_copy, 0)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter_copy, 0)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter3, &iter_copy)); - g_assert (iter_position (store, &iter_copy, 1)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter3, &iter_copy)); + g_assert_true (iter_position (store, &iter_copy, 1)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter_copy, 2)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter_copy, 2)); - g_assert (!gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); - g_assert (iters_equal (&iter3, &iter_copy)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); + g_assert_true (iters_equal (&iter3, &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 2)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 2)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 2)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 2)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter3, &iter_copy)); - g_assert (iter_position (store, &iter3, 1)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter3, &iter_copy)); + g_assert_true (iter_position (store, &iter3, 1)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); - g_assert (!gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); g_object_unref (store); } @@ -431,29 +431,29 @@ tree_store_test_insert_before_NULL (void) /* move_before NULL is basically an append */ gtk_tree_store_insert_before (store, &iter2, NULL, NULL); - g_assert (gtk_tree_store_iter_is_valid (store, &iter2)); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) == 2); + g_assert_true (gtk_tree_store_iter_is_valid (store, &iter2)); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL), ==, 2); /* Walk over the model */ - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 1)); + g_assert_true (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 1)); - g_assert (!gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); - g_assert (iters_equal (&iter2, &iter_copy)); - g_assert (iter_position (store, &iter2, 1)); + g_assert_true (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter_copy, NULL, 1)); + g_assert_true (iters_equal (&iter2, &iter_copy)); + g_assert_true (iter_position (store, &iter2, 1)); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (iter_position (store, &iter, 0)); + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (iter_position (store, &iter, 0)); - g_assert (!gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); + g_assert_false (gtk_tree_model_iter_previous (GTK_TREE_MODEL (store), &iter_copy)); g_object_unref (store); } @@ -489,9 +489,9 @@ tree_store_test_remove_begin (TreeStore *fixture, gtk_tree_model_get_iter (GTK_TREE_MODEL (fixture->store), &iter, path); gtk_tree_path_free (path); - g_assert (gtk_tree_store_remove (fixture->store, &iter) == TRUE); - g_assert (!gtk_tree_store_iter_is_valid (fixture->store, &fixture->iter[0])); - g_assert (iters_equal (&iter, &fixture->iter[1])); + g_assert_true (gtk_tree_store_remove (fixture->store, &iter) == TRUE); + g_assert_false (gtk_tree_store_iter_is_valid (fixture->store, &fixture->iter[0])); + g_assert_true (iters_equal (&iter, &fixture->iter[1])); check_model (fixture, new_order, 0); } @@ -509,9 +509,9 @@ tree_store_test_remove_middle (TreeStore *fixture, gtk_tree_model_get_iter (GTK_TREE_MODEL (fixture->store), &iter, path); gtk_tree_path_free (path); - g_assert (gtk_tree_store_remove (fixture->store, &iter) == TRUE); - g_assert (!gtk_tree_store_iter_is_valid (fixture->store, &fixture->iter[2])); - g_assert (iters_equal (&iter, &fixture->iter[3])); + g_assert_true (gtk_tree_store_remove (fixture->store, &iter)); + g_assert_false (gtk_tree_store_iter_is_valid (fixture->store, &fixture->iter[2])); + g_assert_true (iters_equal (&iter, &fixture->iter[3])); check_model (fixture, new_order, 2); } @@ -529,8 +529,8 @@ tree_store_test_remove_end (TreeStore *fixture, gtk_tree_model_get_iter (GTK_TREE_MODEL (fixture->store), &iter, path); gtk_tree_path_free (path); - g_assert (gtk_tree_store_remove (fixture->store, &iter) == FALSE); - g_assert (!gtk_tree_store_iter_is_valid (fixture->store, &fixture->iter[4])); + g_assert_false (gtk_tree_store_remove (fixture->store, &iter)); + g_assert_false (gtk_tree_store_iter_is_valid (fixture->store, &fixture->iter[4])); check_model (fixture, new_order, 4); } @@ -543,10 +543,10 @@ tree_store_test_clear (TreeStore *fixture, gtk_tree_store_clear (fixture->store); - g_assert (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (fixture->store), NULL) == 0); + g_assert_cmpint (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (fixture->store), NULL), ==, 0); for (i = 0; i < 5; i++) - g_assert (!gtk_tree_store_iter_is_valid (fixture->store, &fixture->iter[i])); + g_assert_false (gtk_tree_store_iter_is_valid (fixture->store, &fixture->iter[i])); } /* reorder */ @@ -573,8 +573,8 @@ tree_store_test_swap_begin (TreeStore *fixture, GtkTreeIter iter_a; GtkTreeIter iter_b; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_a, "0")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_b, "1")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_a, "0")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_b, "1")); gtk_tree_store_swap (fixture->store, &iter_a, &iter_b); check_model (fixture, new_order, -1); @@ -590,8 +590,8 @@ tree_store_test_swap_middle_next (TreeStore *fixture, GtkTreeIter iter_a; GtkTreeIter iter_b; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_a, "2")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_b, "3")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_a, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_b, "3")); gtk_tree_store_swap (fixture->store, &iter_a, &iter_b); check_model (fixture, new_order, -1); @@ -607,8 +607,8 @@ tree_store_test_swap_middle_apart (TreeStore *fixture, GtkTreeIter iter_a; GtkTreeIter iter_b; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_a, "1")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_b, "3")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_a, "1")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_b, "3")); gtk_tree_store_swap (fixture->store, &iter_a, &iter_b); check_model (fixture, new_order, -1); @@ -624,8 +624,8 @@ tree_store_test_swap_end (TreeStore *fixture, GtkTreeIter iter_a; GtkTreeIter iter_b; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_a, "3")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_b, "4")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_a, "3")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter_b, "4")); gtk_tree_store_swap (fixture->store, &iter_a, &iter_b); check_model (fixture, new_order, -1); @@ -648,9 +648,9 @@ tree_store_test_swap_single (void) iter_copy = iter; gtk_tree_store_swap (store, &iter, &iter); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); - g_assert (iters_equal (&iter, &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); + g_assert_true (iters_equal (&iter, &iter_copy)); g_object_unref (store); } @@ -667,8 +667,8 @@ tree_store_test_move_after_from_start (TreeStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "0")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "0")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "2")); gtk_tree_store_move_after (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -684,8 +684,8 @@ tree_store_test_move_after_next (TreeStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "3")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "3")); gtk_tree_store_move_after (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -701,8 +701,8 @@ tree_store_test_move_after_apart (TreeStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "1")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "3")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "1")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "3")); gtk_tree_store_move_after (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -718,8 +718,8 @@ tree_store_test_move_after_end (TreeStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "4")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "4")); gtk_tree_store_move_after (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -735,8 +735,8 @@ tree_store_test_move_after_from_end (TreeStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "4")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "1")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "4")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "1")); gtk_tree_store_move_after (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -754,8 +754,8 @@ tree_store_test_move_after_change_ends (TreeStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "0")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "4")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "0")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "4")); gtk_tree_store_move_after (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -770,7 +770,7 @@ tree_store_test_move_after_NULL (TreeStore *fixture, GtkTreeIter iter; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); gtk_tree_store_move_after (fixture->store, &iter, NULL); check_model (fixture, new_order, -1); @@ -793,14 +793,14 @@ tree_store_test_move_after_single (void) iter_copy = iter; gtk_tree_store_move_after (store, &iter, NULL); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); - g_assert (iters_equal (&iter, &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); + g_assert_true (iters_equal (&iter, &iter_copy)); gtk_tree_store_move_after (store, &iter, &iter); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); - g_assert (iters_equal (&iter, &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); + g_assert_true (iters_equal (&iter, &iter_copy)); g_object_unref (store); } @@ -817,8 +817,8 @@ tree_store_test_move_before_next (TreeStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "3")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "3")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "2")); gtk_tree_store_move_before (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -834,8 +834,8 @@ tree_store_test_move_before_apart (TreeStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "1")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "3")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "1")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "3")); gtk_tree_store_move_before (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -851,8 +851,8 @@ tree_store_test_move_before_to_start (TreeStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "0")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "0")); gtk_tree_store_move_before (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -868,8 +868,8 @@ tree_store_test_move_before_from_end (TreeStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "4")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "4")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "2")); gtk_tree_store_move_before (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -885,8 +885,8 @@ tree_store_test_move_before_change_ends (TreeStore *fixture, GtkTreeIter iter; GtkTreeIter position; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "4")); - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "0")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "4")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &position, "0")); gtk_tree_store_move_before (fixture->store, &iter, &position); check_model (fixture, new_order, -1); @@ -901,7 +901,7 @@ tree_store_test_move_before_NULL (TreeStore *fixture, GtkTreeIter iter; - g_assert (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); + g_assert_true (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store), &iter, "2")); gtk_tree_store_move_before (fixture->store, &iter, NULL); check_model (fixture, new_order, -1); @@ -924,14 +924,14 @@ tree_store_test_move_before_single (void) iter_copy = iter; gtk_tree_store_move_before (store, &iter, NULL); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); - g_assert (iters_equal (&iter, &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); + g_assert_true (iters_equal (&iter, &iter_copy)); gtk_tree_store_move_before (store, &iter, &iter); - g_assert (iters_equal (&iter, &iter_copy)); - g_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); - g_assert (iters_equal (&iter, &iter_copy)); + g_assert_true (iters_equal (&iter, &iter_copy)); + g_assert_true (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)); + g_assert_true (iters_equal (&iter, &iter_copy)); g_object_unref (store); } @@ -947,10 +947,10 @@ tree_store_test_iter_previous_invalid (TreeStore *fixture, gtk_tree_model_get_iter_first (GTK_TREE_MODEL (fixture->store), &iter); - g_assert (gtk_tree_model_iter_previous (GTK_TREE_MODEL (fixture->store), + g_assert_true (gtk_tree_model_iter_previous (GTK_TREE_MODEL (fixture->store), &iter) == FALSE); - g_assert (gtk_tree_store_iter_is_valid (fixture->store, &iter) == FALSE); - g_assert (iter.stamp == 0); + g_assert_false (gtk_tree_store_iter_is_valid (fixture->store, &iter)); + g_assert_cmpint (iter.stamp, ==, 0); } static void @@ -964,10 +964,10 @@ tree_store_test_iter_next_invalid (TreeStore *fixture, gtk_tree_model_get_iter (GTK_TREE_MODEL (fixture->store), &iter, path); gtk_tree_path_free (path); - g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (fixture->store), - &iter) == FALSE); - g_assert (gtk_tree_store_iter_is_valid (fixture->store, &iter) == FALSE); - g_assert (iter.stamp == 0); + g_assert_false (gtk_tree_model_iter_next (GTK_TREE_MODEL (fixture->store), + &iter)); + g_assert_false (gtk_tree_store_iter_is_valid (fixture->store, &iter)); + g_assert_cmpint (iter.stamp, ==, 0); } static void @@ -977,12 +977,12 @@ tree_store_test_iter_children_invalid (TreeStore *fixture, GtkTreeIter iter, child; gtk_tree_model_get_iter_first (GTK_TREE_MODEL (fixture->store), &iter); - g_assert (gtk_tree_store_iter_is_valid (fixture->store, &iter) == TRUE); + g_assert_true (gtk_tree_store_iter_is_valid (fixture->store, &iter)); - g_assert (gtk_tree_model_iter_children (GTK_TREE_MODEL (fixture->store), - &child, &iter) == FALSE); - g_assert (gtk_tree_store_iter_is_valid (fixture->store, &child) == FALSE); - g_assert (child.stamp == 0); + g_assert_false (gtk_tree_model_iter_children (GTK_TREE_MODEL (fixture->store), + &child, &iter)); + g_assert_false (gtk_tree_store_iter_is_valid (fixture->store, &child)); + g_assert_cmpint (child.stamp, ==, 0); } static void @@ -992,12 +992,12 @@ tree_store_test_iter_nth_child_invalid (TreeStore *fixture, GtkTreeIter iter, child; gtk_tree_model_get_iter_first (GTK_TREE_MODEL (fixture->store), &iter); - g_assert (gtk_tree_store_iter_is_valid (fixture->store, &iter) == TRUE); + g_assert_true (gtk_tree_store_iter_is_valid (fixture->store, &iter)); - g_assert (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (fixture->store), - &child, &iter, 0) == FALSE); - g_assert (gtk_tree_store_iter_is_valid (fixture->store, &child) == FALSE); - g_assert (child.stamp == 0); + g_assert_false (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (fixture->store), + &child, &iter, 0)); + g_assert_false (gtk_tree_store_iter_is_valid (fixture->store, &child)); + g_assert_cmpint (child.stamp, ==, 0); } static void @@ -1007,12 +1007,12 @@ tree_store_test_iter_parent_invalid (TreeStore *fixture, GtkTreeIter iter, child; gtk_tree_model_get_iter_first (GTK_TREE_MODEL (fixture->store), &child); - g_assert (gtk_tree_store_iter_is_valid (fixture->store, &child) == TRUE); + g_assert_true (gtk_tree_store_iter_is_valid (fixture->store, &child)); - g_assert (gtk_tree_model_iter_parent (GTK_TREE_MODEL (fixture->store), - &iter, &child) == FALSE); - g_assert (gtk_tree_store_iter_is_valid (fixture->store, &iter) == FALSE); - g_assert (iter.stamp == 0); + g_assert_false (gtk_tree_model_iter_parent (GTK_TREE_MODEL (fixture->store), + &iter, &child)); + g_assert_false (gtk_tree_store_iter_is_valid (fixture->store, &iter)); + g_assert_cmpint (iter.stamp, ==, 0); } /* specific bugs */ diff --git a/testsuite/gtk/treeview.c b/testsuite/gtk/treeview.c index dd36ec7eb1..1ea7e7ef1a 100644 --- a/testsuite/gtk/treeview.c +++ b/testsuite/gtk/treeview.c @@ -77,6 +77,7 @@ test_bug_539377 (void) GtkWidget *view; GtkTreePath *path; GtkListStore *list_store; + gboolean ret; /*http://bugzilla.gnome.org/show_bug.cgi?id=539377 */ @@ -84,20 +85,24 @@ test_bug_539377 (void) /* Non-realized view, no model */ view = gtk_tree_view_new (); - g_assert (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (view), 10, 10, &path, - NULL, NULL, NULL) == FALSE); - g_assert (gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (view), 10, 10, - &path, NULL) == FALSE); + ret = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (view), 10, 10, &path, + NULL, NULL, NULL); + g_assert_false (ret); + ret = gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (view), 10, 10, + &path, NULL); + g_assert_false (ret); /* Non-realized view, with model */ list_store = gtk_list_store_new (1, G_TYPE_STRING); gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (list_store)); - g_assert (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (view), 10, 10, &path, - NULL, NULL, NULL) == FALSE); - g_assert (gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (view), 10, 10, - &path, NULL) == FALSE); + ret = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (view), 10, 10, &path, + NULL, NULL, NULL); + g_assert_false (ret); + ret = gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (view), 10, 10, + &path, NULL); + g_assert_false (ret); g_object_unref (g_object_ref_sink (view)); } diff --git a/testsuite/gtk/typename.c b/testsuite/gtk/typename.c index 1b357b67dc..39776c660a 100644 --- a/testsuite/gtk/typename.c +++ b/testsuite/gtk/typename.c @@ -69,7 +69,7 @@ static void test_GThemedIcon (void) { check ("GThemedIcon", "gthemed_icon_ge int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); g_test_add_func ("/builder/get-type/GtkWindow", test_GtkWindow); g_test_add_func ("/builder/get-type/GtkHBox", test_GtkHBox); diff --git a/testsuite/gtk/widget-refcount.c b/testsuite/gtk/widget-refcount.c index d4fc5d8be6..cebd30982a 100644 --- a/testsuite/gtk/widget-refcount.c +++ b/testsuite/gtk/widget-refcount.c @@ -19,9 +19,9 @@ popover (void) gtk_menu_button_set_popover (GTK_MENU_BUTTON (button), p); /* GtkButton is a normal widget and thus floating */ - g_assert (g_object_is_floating (button)); + g_assert_true (g_object_is_floating (button)); /* GtkPopver sinks itself */ - g_assert (!g_object_is_floating (p)); + g_assert_true (!g_object_is_floating (p)); g_object_weak_ref (G_OBJECT (p), check_finalized, &finalized); @@ -29,7 +29,7 @@ popover (void) g_object_unref (button); /* We do NOT unref p since the only reference held to it gets * removed when the button gets disposed. */ - g_assert (finalized); + g_assert_true (finalized); } static void @@ -41,8 +41,8 @@ popover2 (void) gtk_menu_button_set_popover (GTK_MENU_BUTTON (button), p); - g_assert (g_object_is_floating (button)); - g_assert (!g_object_is_floating (p)); + g_assert_true (g_object_is_floating (button)); + g_assert_true (!g_object_is_floating (p)); g_object_weak_ref (G_OBJECT (p), check_finalized, &finalized); @@ -50,7 +50,7 @@ popover2 (void) gtk_menu_button_set_popover (GTK_MENU_BUTTON (button), NULL); - g_assert (finalized); + g_assert_true (finalized); g_object_unref (button); } @@ -62,13 +62,13 @@ filechooserwidget (void) GtkWidget *w = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN); gboolean finalized = FALSE; - g_assert (g_object_is_floating (w)); + g_assert_true (g_object_is_floating (w)); g_object_ref_sink (w); g_object_weak_ref (G_OBJECT (w), check_finalized, &finalized); g_object_unref (w); - g_assert (finalized); + g_assert_true (finalized); } static void @@ -78,18 +78,18 @@ window (void) gboolean finalized = FALSE; /* GTK holds a ref */ - g_assert (!g_object_is_floating (w)); + g_assert_true (!g_object_is_floating (w)); g_object_weak_ref (G_OBJECT (w), check_finalized, &finalized); gtk_window_destroy (GTK_WINDOW (w)); - g_assert (finalized); + g_assert_true (finalized); } int main (int argc, char **argv) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); gtk_init (); g_test_add_func ("/gtk/widget-refcount/popover", popover); diff --git a/testsuite/gtk/widgetorder.c b/testsuite/gtk/widgetorder.c index 0603f2ad98..94cbedfc67 100644 --- a/testsuite/gtk/widgetorder.c +++ b/testsuite/gtk/widgetorder.c @@ -8,14 +8,14 @@ simple (void) gtk_box_append (GTK_BOX (box), l); - g_assert (gtk_widget_get_parent (l) == box); - g_assert (gtk_widget_get_prev_sibling (l) == NULL); - g_assert (gtk_widget_get_next_sibling (l) == NULL); - g_assert (gtk_widget_get_first_child (l) == NULL); - g_assert (gtk_widget_get_last_child (l) == NULL); - - g_assert (gtk_widget_get_first_child (box) == l); - g_assert (gtk_widget_get_last_child (box) == l); + g_assert_true (gtk_widget_get_parent (l) == box); + g_assert_null (gtk_widget_get_prev_sibling (l)); + g_assert_null (gtk_widget_get_next_sibling (l)); + g_assert_null (gtk_widget_get_first_child (l)); + g_assert_null (gtk_widget_get_last_child (l)); + + g_assert_true (gtk_widget_get_first_child (box) == l); + g_assert_true (gtk_widget_get_last_child (box) == l); } static void @@ -28,16 +28,16 @@ two (void) gtk_box_append (GTK_BOX (box), l1); gtk_box_append (GTK_BOX (box), l2); - g_assert (gtk_widget_get_parent (l1) == box); - g_assert (gtk_widget_get_prev_sibling (l1) == NULL); - g_assert (gtk_widget_get_next_sibling (l1) == l2); + g_assert_true (gtk_widget_get_parent (l1) == box); + g_assert_null (gtk_widget_get_prev_sibling (l1)); + g_assert_true (gtk_widget_get_next_sibling (l1) == l2); - g_assert (gtk_widget_get_parent (l2) == box); - g_assert (gtk_widget_get_prev_sibling (l2) == l1); - g_assert (gtk_widget_get_next_sibling (l2) == NULL); + g_assert_true (gtk_widget_get_parent (l2) == box); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l1); + g_assert_null (gtk_widget_get_next_sibling (l2)); - g_assert (gtk_widget_get_first_child (box) == l1); - g_assert (gtk_widget_get_last_child (box) == l2); + g_assert_true (gtk_widget_get_first_child (box) == l1); + g_assert_true (gtk_widget_get_last_child (box) == l2); } static void @@ -52,16 +52,16 @@ prepend (void) /* l2 should now be *before* l1 */ - g_assert (gtk_widget_get_parent (l1) == p); - g_assert (gtk_widget_get_prev_sibling (l1) == l2); - g_assert (gtk_widget_get_next_sibling (l1) == NULL); + g_assert_true (gtk_widget_get_parent (l1) == p); + g_assert_true (gtk_widget_get_prev_sibling (l1) == l2); + g_assert_null (gtk_widget_get_next_sibling (l1)); - g_assert (gtk_widget_get_parent (l2) == p); - g_assert (gtk_widget_get_prev_sibling (l2) == NULL); - g_assert (gtk_widget_get_next_sibling (l2) == l1); + g_assert_true (gtk_widget_get_parent (l2) == p); + g_assert_null (gtk_widget_get_prev_sibling (l2)); + g_assert_true (gtk_widget_get_next_sibling (l2) == l1); - g_assert (gtk_widget_get_first_child (p) == l2); - g_assert (gtk_widget_get_last_child (p) == l1); + g_assert_true (gtk_widget_get_first_child (p) == l2); + g_assert_true (gtk_widget_get_last_child (p) == l1); } static void @@ -74,16 +74,16 @@ append (void) gtk_widget_set_parent (l1, p); gtk_widget_insert_before (l2, p, NULL); - g_assert (gtk_widget_get_parent (l1) == p); - g_assert (gtk_widget_get_prev_sibling (l1) == NULL); - g_assert (gtk_widget_get_next_sibling (l1) == l2); + g_assert_true (gtk_widget_get_parent (l1) == p); + g_assert_null (gtk_widget_get_prev_sibling (l1)); + g_assert_true (gtk_widget_get_next_sibling (l1) == l2); - g_assert (gtk_widget_get_parent (l2) == p); - g_assert (gtk_widget_get_prev_sibling (l2) == l1); - g_assert (gtk_widget_get_next_sibling (l2) == NULL); + g_assert_true (gtk_widget_get_parent (l2) == p); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l1); + g_assert_null (gtk_widget_get_next_sibling (l2)); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l2); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l2); } static void @@ -97,30 +97,30 @@ insert_after (void) gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l3, p); - g_assert (gtk_widget_get_parent (l1) == p); - g_assert (gtk_widget_get_prev_sibling (l1) == NULL); - g_assert (gtk_widget_get_next_sibling (l1) == l3); + g_assert_true (gtk_widget_get_parent (l1) == p); + g_assert_null (gtk_widget_get_prev_sibling (l1)); + g_assert_true (gtk_widget_get_next_sibling (l1) == l3); - g_assert (gtk_widget_get_parent (l3) == p); - g_assert (gtk_widget_get_prev_sibling (l3) == l1); - g_assert (gtk_widget_get_next_sibling (l3) == NULL); + g_assert_true (gtk_widget_get_parent (l3) == p); + g_assert_true (gtk_widget_get_prev_sibling (l3) == l1); + g_assert_null (gtk_widget_get_next_sibling (l3)); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l3); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l3); /* Now add l2 between l1 and l3 */ gtk_widget_insert_after (l2, p, l1); - g_assert (gtk_widget_get_next_sibling (l1) == l2); + g_assert_true (gtk_widget_get_next_sibling (l1) == l2); - g_assert (gtk_widget_get_parent (l2) == p); - g_assert (gtk_widget_get_prev_sibling (l2) == l1); - g_assert (gtk_widget_get_next_sibling (l2) == l3); + g_assert_true (gtk_widget_get_parent (l2) == p); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l1); + g_assert_true (gtk_widget_get_next_sibling (l2) == l3); - g_assert (gtk_widget_get_prev_sibling (l3) == l2); + g_assert_true (gtk_widget_get_prev_sibling (l3) == l2); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l3); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l3); } static void @@ -134,30 +134,30 @@ insert_before (void) gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l3, p); - g_assert (gtk_widget_get_parent (l1) == p); - g_assert (gtk_widget_get_prev_sibling (l1) == NULL); - g_assert (gtk_widget_get_next_sibling (l1) == l3); + g_assert_true (gtk_widget_get_parent (l1) == p); + g_assert_null (gtk_widget_get_prev_sibling (l1)); + g_assert_true (gtk_widget_get_next_sibling (l1) == l3); - g_assert (gtk_widget_get_parent (l3) == p); - g_assert (gtk_widget_get_prev_sibling (l3) == l1); - g_assert (gtk_widget_get_next_sibling (l3) == NULL); + g_assert_true (gtk_widget_get_parent (l3) == p); + g_assert_true (gtk_widget_get_prev_sibling (l3) == l1); + g_assert_null (gtk_widget_get_next_sibling (l3)); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l3); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l3); /* Now add l2 between l1 and l3 */ gtk_widget_insert_before (l2, p, l3); - g_assert (gtk_widget_get_next_sibling (l1) == l2); + g_assert_true (gtk_widget_get_next_sibling (l1) == l2); - g_assert (gtk_widget_get_parent (l2) == p); - g_assert (gtk_widget_get_prev_sibling (l2) == l1); - g_assert (gtk_widget_get_next_sibling (l2) == l3); + g_assert_true (gtk_widget_get_parent (l2) == p); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l1); + g_assert_true (gtk_widget_get_next_sibling (l2) == l3); - g_assert (gtk_widget_get_prev_sibling (l3) == l2); + g_assert_true (gtk_widget_get_prev_sibling (l3) == l2); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l3); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l3); } static void @@ -168,26 +168,26 @@ insert_after_self (void) gtk_widget_insert_after (l, p, NULL); - g_assert (gtk_widget_get_parent (l) == p); - g_assert (gtk_widget_get_prev_sibling (l) == NULL); - g_assert (gtk_widget_get_next_sibling (l) == NULL); - g_assert (gtk_widget_get_first_child (l) == NULL); - g_assert (gtk_widget_get_last_child (l) == NULL); + g_assert_true (gtk_widget_get_parent (l) == p); + g_assert_null (gtk_widget_get_prev_sibling (l)); + g_assert_null (gtk_widget_get_next_sibling (l)); + g_assert_null (gtk_widget_get_first_child (l)); + g_assert_null (gtk_widget_get_last_child (l)); - g_assert (gtk_widget_get_first_child (p) == l); - g_assert (gtk_widget_get_last_child (p) == l); + g_assert_true (gtk_widget_get_first_child (p) == l); + g_assert_true (gtk_widget_get_last_child (p) == l); /* Insert l after l */ gtk_widget_insert_after (l, p, l); - g_assert (gtk_widget_get_parent (l) == p); - g_assert (gtk_widget_get_prev_sibling (l) == NULL); - g_assert (gtk_widget_get_next_sibling (l) == NULL); - g_assert (gtk_widget_get_first_child (l) == NULL); - g_assert (gtk_widget_get_last_child (l) == NULL); + g_assert_true (gtk_widget_get_parent (l) == p); + g_assert_null (gtk_widget_get_prev_sibling (l)); + g_assert_null (gtk_widget_get_next_sibling (l)); + g_assert_null (gtk_widget_get_first_child (l)); + g_assert_null (gtk_widget_get_last_child (l)); - g_assert (gtk_widget_get_first_child (p) == l); - g_assert (gtk_widget_get_last_child (p) == l); + g_assert_true (gtk_widget_get_first_child (p) == l); + g_assert_true (gtk_widget_get_last_child (p) == l); } static void @@ -198,26 +198,26 @@ insert_before_self (void) gtk_widget_insert_before (l, p, NULL); - g_assert (gtk_widget_get_parent (l) == p); - g_assert (gtk_widget_get_prev_sibling (l) == NULL); - g_assert (gtk_widget_get_next_sibling (l) == NULL); - g_assert (gtk_widget_get_first_child (l) == NULL); - g_assert (gtk_widget_get_last_child (l) == NULL); + g_assert_true (gtk_widget_get_parent (l) == p); + g_assert_null (gtk_widget_get_prev_sibling (l)); + g_assert_null (gtk_widget_get_next_sibling (l)); + g_assert_null (gtk_widget_get_first_child (l)); + g_assert_null (gtk_widget_get_last_child (l)); - g_assert (gtk_widget_get_first_child (p) == l); - g_assert (gtk_widget_get_last_child (p) == l); + g_assert_true (gtk_widget_get_first_child (p) == l); + g_assert_true (gtk_widget_get_last_child (p) == l); /* Insert l before l */ gtk_widget_insert_before (l, p, l); - g_assert (gtk_widget_get_parent (l) == p); - g_assert (gtk_widget_get_prev_sibling (l) == NULL); - g_assert (gtk_widget_get_next_sibling (l) == NULL); - g_assert (gtk_widget_get_first_child (l) == NULL); - g_assert (gtk_widget_get_last_child (l) == NULL); + g_assert_true (gtk_widget_get_parent (l) == p); + g_assert_null (gtk_widget_get_prev_sibling (l)); + g_assert_null (gtk_widget_get_next_sibling (l)); + g_assert_null (gtk_widget_get_first_child (l)); + g_assert_null (gtk_widget_get_last_child (l)); - g_assert (gtk_widget_get_first_child (p) == l); - g_assert (gtk_widget_get_last_child (p) == l); + g_assert_true (gtk_widget_get_first_child (p) == l); + g_assert_true (gtk_widget_get_last_child (p) == l); } static void @@ -231,47 +231,47 @@ reorder_after (void) gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l3, p); - g_assert (gtk_widget_get_parent (l1) == p); - g_assert (gtk_widget_get_prev_sibling (l1) == NULL); - g_assert (gtk_widget_get_next_sibling (l1) == l3); + g_assert_true (gtk_widget_get_parent (l1) == p); + g_assert_null (gtk_widget_get_prev_sibling (l1)); + g_assert_true (gtk_widget_get_next_sibling (l1) == l3); - g_assert (gtk_widget_get_parent (l3) == p); - g_assert (gtk_widget_get_prev_sibling (l3) == l1); - g_assert (gtk_widget_get_next_sibling (l3) == NULL); + g_assert_true (gtk_widget_get_parent (l3) == p); + g_assert_true (gtk_widget_get_prev_sibling (l3) == l1); + g_assert_null (gtk_widget_get_next_sibling (l3)); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l3); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l3); /* Now add l2 between l1 and l3 */ gtk_widget_insert_before (l2, p, l3); - g_assert (gtk_widget_get_next_sibling (l1) == l2); + g_assert_true (gtk_widget_get_next_sibling (l1) == l2); - g_assert (gtk_widget_get_parent (l2) == p); - g_assert (gtk_widget_get_prev_sibling (l2) == l1); - g_assert (gtk_widget_get_next_sibling (l2) == l3); + g_assert_true (gtk_widget_get_parent (l2) == p); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l1); + g_assert_true (gtk_widget_get_next_sibling (l2) == l3); - g_assert (gtk_widget_get_prev_sibling (l3) == l2); + g_assert_true (gtk_widget_get_prev_sibling (l3) == l2); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l3); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l3); /* The order is now l1, l2, l3. Now reorder l3 after l1 so * the correct order is l1, l3, l2 */ gtk_widget_insert_after (l3, p, l1); - g_assert (gtk_widget_get_prev_sibling (l1) == NULL); - g_assert (gtk_widget_get_next_sibling (l1) == l3); + g_assert_null (gtk_widget_get_prev_sibling (l1)); + g_assert_true (gtk_widget_get_next_sibling (l1) == l3); - g_assert (gtk_widget_get_prev_sibling (l3) == l1); - g_assert (gtk_widget_get_next_sibling (l3) == l2); + g_assert_true (gtk_widget_get_prev_sibling (l3) == l1); + g_assert_true (gtk_widget_get_next_sibling (l3) == l2); - g_assert (gtk_widget_get_prev_sibling (l2) == l3); - g_assert (gtk_widget_get_next_sibling (l2) == NULL); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l3); + g_assert_null (gtk_widget_get_next_sibling (l2)); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l2); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l2); } static void @@ -285,47 +285,47 @@ reorder_before (void) gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l3, p); - g_assert (gtk_widget_get_parent (l1) == p); - g_assert (gtk_widget_get_prev_sibling (l1) == NULL); - g_assert (gtk_widget_get_next_sibling (l1) == l3); + g_assert_true (gtk_widget_get_parent (l1) == p); + g_assert_null (gtk_widget_get_prev_sibling (l1)); + g_assert_true (gtk_widget_get_next_sibling (l1) == l3); - g_assert (gtk_widget_get_parent (l3) == p); - g_assert (gtk_widget_get_prev_sibling (l3) == l1); - g_assert (gtk_widget_get_next_sibling (l3) == NULL); + g_assert_true (gtk_widget_get_parent (l3) == p); + g_assert_true (gtk_widget_get_prev_sibling (l3) == l1); + g_assert_null (gtk_widget_get_next_sibling (l3)); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l3); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l3); /* Now add l2 between l1 and l3 */ gtk_widget_insert_before (l2, p, l3); - g_assert (gtk_widget_get_next_sibling (l1) == l2); + g_assert_true (gtk_widget_get_next_sibling (l1) == l2); - g_assert (gtk_widget_get_parent (l2) == p); - g_assert (gtk_widget_get_prev_sibling (l2) == l1); - g_assert (gtk_widget_get_next_sibling (l2) == l3); + g_assert_true (gtk_widget_get_parent (l2) == p); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l1); + g_assert_true (gtk_widget_get_next_sibling (l2) == l3); - g_assert (gtk_widget_get_prev_sibling (l3) == l2); + g_assert_true (gtk_widget_get_prev_sibling (l3) == l2); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l3); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l3); /* The order is now l1, l2, l3. Now reorder l3 before l2 so * the correct order is l1, l3, l2 */ gtk_widget_insert_before (l3, p, l2); - g_assert (gtk_widget_get_prev_sibling (l1) == NULL); - g_assert (gtk_widget_get_next_sibling (l1) == l3); + g_assert_null (gtk_widget_get_prev_sibling (l1)); + g_assert_true (gtk_widget_get_next_sibling (l1) == l3); - g_assert (gtk_widget_get_prev_sibling (l3) == l1); - g_assert (gtk_widget_get_next_sibling (l3) == l2); + g_assert_true (gtk_widget_get_prev_sibling (l3) == l1); + g_assert_true (gtk_widget_get_next_sibling (l3) == l2); - g_assert (gtk_widget_get_prev_sibling (l2) == l3); - g_assert (gtk_widget_get_next_sibling (l2) == NULL); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l3); + g_assert_null (gtk_widget_get_next_sibling (l2)); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l2); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l2); } static void @@ -339,47 +339,47 @@ reorder_start (void) gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l3, p); - g_assert (gtk_widget_get_parent (l1) == p); - g_assert (gtk_widget_get_prev_sibling (l1) == NULL); - g_assert (gtk_widget_get_next_sibling (l1) == l3); + g_assert_true (gtk_widget_get_parent (l1) == p); + g_assert_null (gtk_widget_get_prev_sibling (l1)); + g_assert_true (gtk_widget_get_next_sibling (l1) == l3); - g_assert (gtk_widget_get_parent (l3) == p); - g_assert (gtk_widget_get_prev_sibling (l3) == l1); - g_assert (gtk_widget_get_next_sibling (l3) == NULL); + g_assert_true (gtk_widget_get_parent (l3) == p); + g_assert_true (gtk_widget_get_prev_sibling (l3) == l1); + g_assert_null (gtk_widget_get_next_sibling (l3)); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l3); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l3); /* Now add l2 between l1 and l3 */ gtk_widget_insert_before (l2, p, l3); - g_assert (gtk_widget_get_next_sibling (l1) == l2); + g_assert_true (gtk_widget_get_next_sibling (l1) == l2); - g_assert (gtk_widget_get_parent (l2) == p); - g_assert (gtk_widget_get_prev_sibling (l2) == l1); - g_assert (gtk_widget_get_next_sibling (l2) == l3); + g_assert_true (gtk_widget_get_parent (l2) == p); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l1); + g_assert_true (gtk_widget_get_next_sibling (l2) == l3); - g_assert (gtk_widget_get_prev_sibling (l3) == l2); + g_assert_true (gtk_widget_get_prev_sibling (l3) == l2); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l3); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l3); /* The order is now l1, l2, l3. Now reorder l3 to the start so * the correct order is l3, l1, l2 */ gtk_widget_insert_after (l3, p, NULL); - g_assert (gtk_widget_get_prev_sibling (l1) == l3); - g_assert (gtk_widget_get_next_sibling (l1) == l2); + g_assert_true (gtk_widget_get_prev_sibling (l1) == l3); + g_assert_true (gtk_widget_get_next_sibling (l1) == l2); - g_assert (gtk_widget_get_prev_sibling (l3) == NULL); - g_assert (gtk_widget_get_next_sibling (l3) == l1); + g_assert_null (gtk_widget_get_prev_sibling (l3)); + g_assert_true (gtk_widget_get_next_sibling (l3) == l1); - g_assert (gtk_widget_get_prev_sibling (l2) == l1); - g_assert (gtk_widget_get_next_sibling (l2) == NULL); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l1); + g_assert_null (gtk_widget_get_next_sibling (l2)); - g_assert (gtk_widget_get_first_child (p) == l3); - g_assert (gtk_widget_get_last_child (p) == l2); + g_assert_true (gtk_widget_get_first_child (p) == l3); + g_assert_true (gtk_widget_get_last_child (p) == l2); } static void @@ -393,47 +393,47 @@ reorder_end (void) gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l3, p); - g_assert (gtk_widget_get_parent (l1) == p); - g_assert (gtk_widget_get_prev_sibling (l1) == NULL); - g_assert (gtk_widget_get_next_sibling (l1) == l3); + g_assert_true (gtk_widget_get_parent (l1) == p); + g_assert_null (gtk_widget_get_prev_sibling (l1)); + g_assert_true (gtk_widget_get_next_sibling (l1) == l3); - g_assert (gtk_widget_get_parent (l3) == p); - g_assert (gtk_widget_get_prev_sibling (l3) == l1); - g_assert (gtk_widget_get_next_sibling (l3) == NULL); + g_assert_true (gtk_widget_get_parent (l3) == p); + g_assert_true (gtk_widget_get_prev_sibling (l3) == l1); + g_assert_null (gtk_widget_get_next_sibling (l3)); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l3); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l3); /* Now add l2 between l1 and l3 */ gtk_widget_insert_before (l2, p, l3); - g_assert (gtk_widget_get_next_sibling (l1) == l2); + g_assert_true (gtk_widget_get_next_sibling (l1) == l2); - g_assert (gtk_widget_get_parent (l2) == p); - g_assert (gtk_widget_get_prev_sibling (l2) == l1); - g_assert (gtk_widget_get_next_sibling (l2) == l3); + g_assert_true (gtk_widget_get_parent (l2) == p); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l1); + g_assert_true (gtk_widget_get_next_sibling (l2) == l3); - g_assert (gtk_widget_get_prev_sibling (l3) == l2); + g_assert_true (gtk_widget_get_prev_sibling (l3) == l2); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l3); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l3); /* The order is now l1, l2, l3. Now reorder l1 to the end so * the correct order is l2, l3, l1 */ gtk_widget_insert_before (l1, p, NULL); - g_assert (gtk_widget_get_prev_sibling (l1) == l3); - g_assert (gtk_widget_get_next_sibling (l1) == NULL); + g_assert_true (gtk_widget_get_prev_sibling (l1) == l3); + g_assert_null (gtk_widget_get_next_sibling (l1)); - g_assert (gtk_widget_get_prev_sibling (l3) == l2); - g_assert (gtk_widget_get_next_sibling (l3) == l1); + g_assert_true (gtk_widget_get_prev_sibling (l3) == l2); + g_assert_true (gtk_widget_get_next_sibling (l3) == l1); - g_assert (gtk_widget_get_prev_sibling (l2) == NULL); - g_assert (gtk_widget_get_next_sibling (l2) == l3); + g_assert_null (gtk_widget_get_prev_sibling (l2)); + g_assert_true (gtk_widget_get_next_sibling (l2) == l3); - g_assert (gtk_widget_get_first_child (p) == l2); - g_assert (gtk_widget_get_last_child (p) == l1); + g_assert_true (gtk_widget_get_first_child (p) == l2); + g_assert_true (gtk_widget_get_last_child (p) == l1); } static void @@ -446,28 +446,28 @@ same_after (void) gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l2, p); - g_assert (gtk_widget_get_parent (l1) == p); - g_assert (gtk_widget_get_prev_sibling (l1) == NULL); - g_assert (gtk_widget_get_next_sibling (l1) == l2); + g_assert_true (gtk_widget_get_parent (l1) == p); + g_assert_null (gtk_widget_get_prev_sibling (l1)); + g_assert_true (gtk_widget_get_next_sibling (l1) == l2); - g_assert (gtk_widget_get_parent (l2) == p); - g_assert (gtk_widget_get_prev_sibling (l2) == l1); - g_assert (gtk_widget_get_next_sibling (l2) == NULL); + g_assert_true (gtk_widget_get_parent (l2) == p); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l1); + g_assert_null (gtk_widget_get_next_sibling (l2)); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l2); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l2); /* l2 is already after l1, so this shouldn't change anything! */ gtk_widget_insert_after (l2, p, l1); - g_assert (gtk_widget_get_prev_sibling (l2) == l1); - g_assert (gtk_widget_get_next_sibling (l2) == NULL); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l1); + g_assert_null (gtk_widget_get_next_sibling (l2)); - g_assert (gtk_widget_get_prev_sibling (l1) == NULL); - g_assert (gtk_widget_get_next_sibling (l1) == l2); + g_assert_null (gtk_widget_get_prev_sibling (l1)); + g_assert_true (gtk_widget_get_next_sibling (l1) == l2); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l2); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l2); } static void @@ -480,28 +480,28 @@ same_before (void) gtk_widget_set_parent (l1, p); gtk_widget_set_parent (l2, p); - g_assert (gtk_widget_get_parent (l1) == p); - g_assert (gtk_widget_get_prev_sibling (l1) == NULL); - g_assert (gtk_widget_get_next_sibling (l1) == l2); + g_assert_true (gtk_widget_get_parent (l1) == p); + g_assert_null (gtk_widget_get_prev_sibling (l1)); + g_assert_true (gtk_widget_get_next_sibling (l1) == l2); - g_assert (gtk_widget_get_parent (l2) == p); - g_assert (gtk_widget_get_prev_sibling (l2) == l1); - g_assert (gtk_widget_get_next_sibling (l2) == NULL); + g_assert_true (gtk_widget_get_parent (l2) == p); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l1); + g_assert_null (gtk_widget_get_next_sibling (l2)); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l2); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l2); /* l1 is already before l2, so this shouldn't change anything! */ gtk_widget_insert_before (l1, p, l2); - g_assert (gtk_widget_get_prev_sibling (l2) == l1); - g_assert (gtk_widget_get_next_sibling (l2) == NULL); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l1); + g_assert_null (gtk_widget_get_next_sibling (l2)); - g_assert (gtk_widget_get_prev_sibling (l1) == NULL); - g_assert (gtk_widget_get_next_sibling (l1) == l2); + g_assert_null (gtk_widget_get_prev_sibling (l1)); + g_assert_true (gtk_widget_get_next_sibling (l1) == l2); - g_assert (gtk_widget_get_first_child (p) == l1); - g_assert (gtk_widget_get_last_child (p) == l2); + g_assert_true (gtk_widget_get_first_child (p) == l1); + g_assert_true (gtk_widget_get_last_child (p) == l2); } static void @@ -520,29 +520,29 @@ no_loop (void) gtk_widget_insert_after (l1, p, l3); /* Now: l2 -> l3 -> l1 */ - g_assert (gtk_widget_get_prev_sibling (l2) == NULL); - g_assert (gtk_widget_get_next_sibling (l2) == l3); - g_assert (gtk_widget_get_next_sibling (l3) == l1); - g_assert (gtk_widget_get_next_sibling (l1) == NULL); - g_assert (gtk_widget_get_prev_sibling (l1) == l3); + g_assert_null (gtk_widget_get_prev_sibling (l2)); + g_assert_true (gtk_widget_get_next_sibling (l2) == l3); + g_assert_true (gtk_widget_get_next_sibling (l3) == l1); + g_assert_null (gtk_widget_get_next_sibling (l1)); + g_assert_true (gtk_widget_get_prev_sibling (l1) == l3); gtk_widget_insert_after (l2, p, l1); /* Now: l3 -> l1 -> l2 */ - g_assert (gtk_widget_get_prev_sibling (l3) == NULL); - g_assert (gtk_widget_get_next_sibling (l3) == l1); - g_assert (gtk_widget_get_next_sibling (l1) == l2); - g_assert (gtk_widget_get_prev_sibling (l1) == l3); - g_assert (gtk_widget_get_prev_sibling (l2) == l1); - g_assert (gtk_widget_get_next_sibling (l2) == NULL); + g_assert_null (gtk_widget_get_prev_sibling (l3)); + g_assert_true (gtk_widget_get_next_sibling (l3) == l1); + g_assert_true (gtk_widget_get_next_sibling (l1) == l2); + g_assert_true (gtk_widget_get_prev_sibling (l1) == l3); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l1); + g_assert_null (gtk_widget_get_next_sibling (l2)); gtk_widget_insert_after (l1, p, NULL); /* Now: l1 -> l3 -> l2 */ - g_assert (gtk_widget_get_prev_sibling (l1) == NULL); - g_assert (gtk_widget_get_next_sibling (l1) == l3); - g_assert (gtk_widget_get_next_sibling (l3) == l2); - g_assert (gtk_widget_get_prev_sibling (l3) == l1); - g_assert (gtk_widget_get_prev_sibling (l2) == l3); - g_assert (gtk_widget_get_next_sibling (l2) == NULL); + g_assert_null (gtk_widget_get_prev_sibling (l1)); + g_assert_true (gtk_widget_get_next_sibling (l1) == l3); + g_assert_true (gtk_widget_get_next_sibling (l3) == l2); + g_assert_true (gtk_widget_get_prev_sibling (l3) == l1); + g_assert_true (gtk_widget_get_prev_sibling (l2) == l3); + g_assert_null (gtk_widget_get_next_sibling (l2)); } static void @@ -552,30 +552,30 @@ reorder_refcount (void) GtkWidget *l1 = gtk_label_new (""); GtkWidget *l2 = gtk_label_new (""); - g_assert (g_object_is_floating (l1)); - g_assert (G_OBJECT (l1)->ref_count == 1); + g_assert_true (g_object_is_floating (l1)); + g_assert_cmpint (G_OBJECT (l1)->ref_count, ==, 1); gtk_widget_set_parent (l1, p); - g_assert (!g_object_is_floating (l1)); - g_assert (G_OBJECT (l1)->ref_count == 1); + g_assert_true (!g_object_is_floating (l1)); + g_assert_cmpint (G_OBJECT (l1)->ref_count, ==, 1); - g_assert (g_object_is_floating (l2)); - g_assert (G_OBJECT (l2)->ref_count == 1); + g_assert_true (g_object_is_floating (l2)); + g_assert_cmpint (G_OBJECT (l2)->ref_count, ==, 1); gtk_widget_set_parent (l2, p); - g_assert (!g_object_is_floating (l2)); - g_assert (G_OBJECT (l2)->ref_count == 1); + g_assert_true (!g_object_is_floating (l2)); + g_assert_cmpint (G_OBJECT (l2)->ref_count, ==, 1); - g_assert (gtk_widget_get_next_sibling (l1) == l2); + g_assert_true (gtk_widget_get_next_sibling (l1) == l2); gtk_widget_insert_before (l2, p, l1); - g_assert (gtk_widget_get_prev_sibling (l1) == l2); + g_assert_true (gtk_widget_get_prev_sibling (l1) == l2); - g_assert (G_OBJECT (l1)->ref_count == 1); - g_assert (G_OBJECT (l2)->ref_count == 1); + g_assert_cmpint (G_OBJECT (l1)->ref_count, ==, 1); + g_assert_cmpint (G_OBJECT (l2)->ref_count, ==, 1); gtk_widget_unparent (l1); gtk_widget_unparent (l2); @@ -586,7 +586,7 @@ int main (int argc, char **argv) { gtk_init (); - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); g_test_add_func ("/widgetorder/simple", simple); g_test_add_func ("/widgetorder/two", two); |