AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

tests: make GtkMenu test more flexible

Browse Source 
We were using gtk_menu_item_get_label() from a testcase to determine the
label associated with a menu item.  Future changes to GtkModelMenuItem
will cause this to stop working, so try a bit harder to find a label
inside of the item.
This commit is contained in:
Ryan Lortie 2013-05-05 17:18:13 -04:00 committed by Jasper St. Pierre
parent 0e40afd5b0
commit 58481ffabf
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/tests/gtkmenu.c
View File

@ -216,6 +216,25 @@ random_menu_new (GRand *rand,
static void assert_menu_equality (GtkContainer *container, GMenuModel *model);
static const gchar *
get_label (GtkMenuItem *item)
{
GList *children = gtk_container_get_children (GTK_CONTAINER (item));
const gchar *label = NULL;
while (children)
{
if (GTK_IS_CONTAINER (children->data))
children = g_list_concat (children, gtk_container_get_children (children->data));
else if (GTK_IS_LABEL (children->data))
label = gtk_label_get_text (children->data);
children = g_list_delete_link (children, children);
}
return label;
}
/* a bit complicated with the separators...
*
* with_separators are if subsections of this GMenuModel should have
@ -307,7 +326,7 @@ assert_section_equality (GSList **children,
our_children = g_slist_remove (our_children, item);
/* get_label() returns "" when it ought to return NULL */
g_assert_cmpstr (gtk_menu_item_get_label (item), ==, label ? label : "");
g_assert_cmpstr (get_label (item), ==, label ? label : "");
submenu_widget = gtk_menu_item_get_submenu (item);
if (submenu)