From 2bfd66b03ef2aefcd8a48e23c81dd1509e1b13dd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 8 Jun 2010 10:19:37 -0500 Subject: Stealing the layout test to make a submenu test --- tests/test-glib-submenu-client.c | 131 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 tests/test-glib-submenu-client.c (limited to 'tests/test-glib-submenu-client.c') diff --git a/tests/test-glib-submenu-client.c b/tests/test-glib-submenu-client.c new file mode 100644 index 0000000..5b40047 --- /dev/null +++ b/tests/test-glib-submenu-client.c @@ -0,0 +1,131 @@ +/* +A test for libdbusmenu to ensure its quality. + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License version 3, as published +by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranties of +MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program. If not, see . +*/ + +#include + +#include +#include + +#include "test-glib-submenu.h" + +static guint layouton = 0; +static GMainLoop * mainloop = NULL; +static gboolean passed = TRUE; + +static gboolean +verify_root_to_layout(DbusmenuMenuitem * mi, layout_t * layout) +{ + g_debug("Verifying ID: %d", layout->id); + + if (layout->id != dbusmenu_menuitem_get_id(mi)) { + if (!(dbusmenu_menuitem_get_root(mi) && dbusmenu_menuitem_get_id(mi) == 0)) { + g_debug("Failed as ID %d is not equal to %d", layout->id, dbusmenu_menuitem_get_id(mi)); + return FALSE; + } + } + + GList * children = dbusmenu_menuitem_get_children(mi); + + if (children == NULL && layout->submenu == NULL) { + return TRUE; + } + if (children == NULL || layout->submenu == NULL) { + if (children == NULL) { + g_debug("Failed as there are no children but we have submenus"); + } else { + g_debug("Failed as we have children but no submenu"); + } + return FALSE; + } + + guint i = 0; + for (i = 0; children != NULL && layout->submenu[i].id != -1; children = g_list_next(children), i++) { + if (!verify_root_to_layout(DBUSMENU_MENUITEM(children->data), &layout->submenu[i])) { + return FALSE; + } + } + + if (children == NULL && layout->submenu[i].id == -1) { + return TRUE; + } + + if (children != NULL) { + g_debug("Failed as there are still children but no submenus. (ID: %d)", layout->id); + } else { + g_debug("Failed as there are still submenus but no children. (ID: %d)", layout->id); + } + return FALSE; +} + +static void +layout_updated (DbusmenuClient * client, gpointer data) +{ + g_debug("Layout Updated"); + + DbusmenuMenuitem * menuroot = dbusmenu_client_get_root(client); + layout_t * layout = &layouts[layouton]; + + if (!verify_root_to_layout(menuroot, layout)) { + g_debug("Failed layout: %d", layouton); + passed = FALSE; + } + + layouton++; + + if (layouts[layouton].id == -1) { + g_main_loop_quit(mainloop); + } + + return; +} + +static gboolean +timer_func (gpointer data) +{ + g_debug("Death timer. Oops. Got to: %d", layouton); + passed = FALSE; + g_main_loop_quit(mainloop); + return FALSE; +} + +int +main (int argc, char ** argv) +{ + g_type_init(); + + DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test"); + g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL); + + g_timeout_add_seconds(10, timer_func, client); + + mainloop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(mainloop); + + g_object_unref(G_OBJECT(client)); + + if (passed) { + g_debug("Quiting"); + return 0; + } else { + g_debug("Quiting as we're a failure"); + return 1; + } +} -- cgit v1.2.3 From 842ccdb932c28bb57976c70929c817b190001b90 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 8 Jun 2010 15:30:35 -0500 Subject: Realization watching for the children display --- tests/test-glib-submenu-client.c | 61 +++++++++++++--------------------------- 1 file changed, 20 insertions(+), 41 deletions(-) (limited to 'tests/test-glib-submenu-client.c') diff --git a/tests/test-glib-submenu-client.c b/tests/test-glib-submenu-client.c index 5b40047..d4f498e 100644 --- a/tests/test-glib-submenu-client.c +++ b/tests/test-glib-submenu-client.c @@ -30,49 +30,22 @@ static guint layouton = 0; static GMainLoop * mainloop = NULL; static gboolean passed = TRUE; -static gboolean -verify_root_to_layout(DbusmenuMenuitem * mi, layout_t * layout) +static void +realization (DbusmenuMenuitem * mi) { - g_debug("Verifying ID: %d", layout->id); - - if (layout->id != dbusmenu_menuitem_get_id(mi)) { - if (!(dbusmenu_menuitem_get_root(mi) && dbusmenu_menuitem_get_id(mi) == 0)) { - g_debug("Failed as ID %d is not equal to %d", layout->id, dbusmenu_menuitem_get_id(mi)); - return FALSE; - } - } - - GList * children = dbusmenu_menuitem_get_children(mi); - - if (children == NULL && layout->submenu == NULL) { - return TRUE; - } - if (children == NULL || layout->submenu == NULL) { - if (children == NULL) { - g_debug("Failed as there are no children but we have submenus"); - } else { - g_debug("Failed as we have children but no submenu"); - } - return FALSE; - } + const gchar * value; + value = dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY); - guint i = 0; - for (i = 0; children != NULL && layout->submenu[i].id != -1; children = g_list_next(children), i++) { - if (!verify_root_to_layout(DBUSMENU_MENUITEM(children->data), &layout->submenu[i])) { - return FALSE; + if (layouton % 2 == 0) { + if (value == NULL) { + passed = FALSE; } - } - - if (children == NULL && layout->submenu[i].id == -1) { - return TRUE; - } - - if (children != NULL) { - g_debug("Failed as there are still children but no submenus. (ID: %d)", layout->id); } else { - g_debug("Failed as there are still submenus but no children. (ID: %d)", layout->id); + if (value != NULL) { + passed = FALSE; + } } - return FALSE; + return; } static void @@ -81,13 +54,19 @@ layout_updated (DbusmenuClient * client, gpointer data) g_debug("Layout Updated"); DbusmenuMenuitem * menuroot = dbusmenu_client_get_root(client); - layout_t * layout = &layouts[layouton]; - if (!verify_root_to_layout(menuroot, layout)) { - g_debug("Failed layout: %d", layouton); + + GList * children = dbusmenu_menuitem_get_children(menuroot); + if (children == NULL) { passed = FALSE; + goto exit; + } + + for (; children != NULL; children = g_list_next(children)) { + g_signal_connect(G_OBJECT(children->data), DBUSMENU_MENUITEM_SIGNAL_REALIZED, G_CALLBACK(realization), NULL); } +exit: layouton++; if (layouts[layouton].id == -1) { -- cgit v1.2.3 From 4ea766fce2d289cedcc6f8de8d7b6e0071786703 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 8 Jun 2010 15:48:01 -0500 Subject: Some more debugging messages. Cleaning up a bit. --- tests/test-glib-submenu-client.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'tests/test-glib-submenu-client.c') diff --git a/tests/test-glib-submenu-client.c b/tests/test-glib-submenu-client.c index d4f498e..57762cd 100644 --- a/tests/test-glib-submenu-client.c +++ b/tests/test-glib-submenu-client.c @@ -34,6 +34,8 @@ static void realization (DbusmenuMenuitem * mi) { const gchar * value; + gboolean original = passed; + value = dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY); if (layouton % 2 == 0) { @@ -45,6 +47,11 @@ realization (DbusmenuMenuitem * mi) passed = FALSE; } } + + if (original != passed) { + g_debug("Oops, this is where we failed"); + } + return; } @@ -54,19 +61,21 @@ layout_updated (DbusmenuClient * client, gpointer data) g_debug("Layout Updated"); DbusmenuMenuitem * menuroot = dbusmenu_client_get_root(client); - + if (menuroot == NULL) { + g_debug("Root is NULL?"); + return; + } GList * children = dbusmenu_menuitem_get_children(menuroot); if (children == NULL) { + g_debug("No Children on root -- fail"); passed = FALSE; - goto exit; - } - - for (; children != NULL; children = g_list_next(children)) { - g_signal_connect(G_OBJECT(children->data), DBUSMENU_MENUITEM_SIGNAL_REALIZED, G_CALLBACK(realization), NULL); + } else { + for (; children != NULL; children = g_list_next(children)) { + g_signal_connect(G_OBJECT(children->data), DBUSMENU_MENUITEM_SIGNAL_REALIZED, G_CALLBACK(realization), NULL); + } } -exit: layouton++; if (layouts[layouton].id == -1) { -- cgit v1.2.3