diff --git a/tests/a11y/Makefile.am b/tests/a11y/Makefile.am index e7ef78f9e3..d6c824fc14 100644 --- a/tests/a11y/Makefile.am +++ b/tests/a11y/Makefile.am @@ -18,14 +18,11 @@ LDADD = \ TEST_PROGS += accessibility-dump -accessibility_dump_SOURCES = \ - accessibility-dump.c - TEST_PROGS += tree-performance TEST_PROGS += text -TEST_PROGS += misc +TEST_PROGS += children EXTRA_DIST += \ hello-world.ui hello-world.txt \ diff --git a/tests/a11y/children.c b/tests/a11y/children.c new file mode 100644 index 0000000000..af0d21beea --- /dev/null +++ b/tests/a11y/children.c @@ -0,0 +1,169 @@ +/* + * Copyright (C) 2011 Red Hat Inc. + * + * Author: + * Matthias Clasen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include +#include + +static void +test_scrolled_window_child_count (void) +{ + GtkWidget *sw; + AtkObject *accessible; + + sw = gtk_scrolled_window_new (NULL, NULL); + g_object_ref_sink (sw); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), + GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), gtk_label_new ("Bla")); + + accessible = gtk_widget_get_accessible (sw); + g_assert_cmpint (atk_object_get_n_accessible_children (accessible), ==, 3); + + g_object_unref (sw); +} + +typedef struct { + gint count; + gint index; + gint n_children; +} SignalData; + +static void +children_changed (AtkObject *accessible, + guint index, + gpointer child, + SignalData *data) +{ + data->count++; + data->index = index; + data->n_children = atk_object_get_n_accessible_children (accessible); +} + +static void +add_child (GtkWidget *container, + GtkWidget *child) +{ + if (GTK_IS_SCROLLED_WINDOW (container)) + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (container), child); + else + gtk_container_add (GTK_CONTAINER (container), child); +} + +static void +remove_child (GtkWidget *container, + GtkWidget *child) +{ + if (GTK_IS_SCROLLED_WINDOW (container)) + { + if (gtk_widget_get_parent (child) != container) + child = gtk_widget_get_parent (child); + } + + gtk_container_remove (GTK_CONTAINER (container), child); +} + +static void +test_add_remove (GtkWidget *widget) +{ + AtkObject *accessible; + SignalData add_data; + SignalData remove_data; + GtkWidget *child[3]; + gint i, j; + gint step_children; + + accessible = gtk_widget_get_accessible (widget); + + add_data.count = 0; + remove_data.count = 0; + g_signal_connect (accessible, "children_changed::add", + G_CALLBACK (children_changed), &add_data); + g_signal_connect (accessible, "children_changed::remove", + G_CALLBACK (children_changed), &remove_data); + + step_children = atk_object_get_n_accessible_children (accessible); + + for (i = 0; i < 3; i++) + { + if (gtk_container_child_type (GTK_CONTAINER (widget)) == G_TYPE_NONE) + break; + + child[i] = gtk_label_new ("bla"); + add_child (widget, child[i]); + + g_assert_cmpint (add_data.count, ==, i + 1); + g_assert_cmpint (add_data.n_children, ==, step_children + i + 1); + g_assert_cmpint (remove_data.count, ==, 0); + } + for (j = 0 ; j < i; j++) + { + remove_child (widget, child[j]); + g_assert_cmpint (add_data.count, ==, i); + g_assert_cmpint (remove_data.count, ==, j + 1); + g_assert_cmpint (remove_data.n_children, ==, step_children + i - j - 1); + } + + g_signal_handlers_disconnect_by_func (accessible, G_CALLBACK (children_changed), &add_data); + g_signal_handlers_disconnect_by_func (accessible, G_CALLBACK (children_changed), &remove_data); +} + +static void +add_child_test (const gchar *prefix, + GTestFixtureFunc test_func, + GtkWidget *widget) +{ + gchar *path; + + path = g_strdup_printf ("%s/%s", prefix, G_OBJECT_TYPE_NAME (widget)); + g_test_add_vtable (path, + 0, + g_object_ref (widget), + 0, + (GTestFixtureFunc) test_func, + (GTestFixtureFunc) g_object_unref); + g_free (path); +} + +static void +add_child_tests (GtkWidget *widget) +{ + g_object_ref_sink (widget); + add_child_test ("/child/add-remove", (GTestFixtureFunc)test_add_remove, widget); + g_object_unref (widget); +} + +int +main (int argc, char *argv[]) +{ + gtk_test_init (&argc, &argv, NULL); + + g_test_add_func ("/scrolledwindow/child-count", test_scrolled_window_child_count); + + add_child_tests (gtk_scrolled_window_new (NULL, NULL)); + add_child_tests (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + add_child_tests (gtk_paned_new (GTK_ORIENTATION_HORIZONTAL)); + add_child_tests (gtk_grid_new ()); + add_child_tests (gtk_event_box_new ()); + + return g_test_run (); +} + diff --git a/tests/a11y/misc.c b/tests/a11y/misc.c deleted file mode 100644 index 897914bd54..0000000000 --- a/tests/a11y/misc.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2011 Red Hat Inc. - * - * Author: - * Matthias Clasen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include -#include - -static void -test_scrolled_window_children (void) -{ - GtkWidget *sw; - AtkObject *accessible; - - sw = gtk_scrolled_window_new (NULL, NULL); - g_object_ref_sink (sw); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), - GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS); - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), gtk_label_new ("Bla")); - - accessible = gtk_widget_get_accessible (sw); - g_assert_cmpint (atk_object_get_n_accessible_children (accessible), ==, 3); - - g_object_unref (sw); -} - -int -main (int argc, char *argv[]) -{ - gtk_test_init (&argc, &argv, NULL); - - g_test_add_func ("/scrolledwindow/children", test_scrolled_window_children); - return g_test_run (); -} -