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 +++++++++++++++++++++++++++++++++++++++ tests/test-glib-submenu-server.c | 109 ++++++++++++++++++++++++++++++++ tests/test-glib-submenu.h | 78 +++++++++++++++++++++++ 3 files changed, 318 insertions(+) create mode 100644 tests/test-glib-submenu-client.c create mode 100644 tests/test-glib-submenu-server.c create mode 100644 tests/test-glib-submenu.h (limited to 'tests') 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; + } +} diff --git a/tests/test-glib-submenu-server.c b/tests/test-glib-submenu-server.c new file mode 100644 index 0000000..68f7004 --- /dev/null +++ b/tests/test-glib-submenu-server.c @@ -0,0 +1,109 @@ +/* +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 +#include + +#include +#include + +#include "test-glib-submenu.h" + + +static DbusmenuMenuitem * +layout2menuitem (layout_t * layout) +{ + if (layout == NULL || layout->id == 0) return NULL; + + DbusmenuMenuitem * local = dbusmenu_menuitem_new_with_id(layout->id); + + if (layout->submenu != NULL) { + guint count; + for (count = 0; layout->submenu[count].id != -1; count++) { + DbusmenuMenuitem * child = layout2menuitem(&layout->submenu[count]); + if (child != NULL) { + dbusmenu_menuitem_child_append(local, child); + } + } + } + + /* g_debug("Layout to menu return: 0x%X", (unsigned int)local); */ + return local; +} + +static guint layouton = 0; +static DbusmenuServer * server = NULL; +static GMainLoop * mainloop = NULL; + +static gboolean +timer_func (gpointer data) +{ + if (layouts[layouton].id == -1) { + g_main_loop_quit(mainloop); + return FALSE; + } + g_debug("Updating to Layout %d", layouton); + + dbusmenu_server_set_root(server, layout2menuitem(&layouts[layouton])); + layouton++; + + return TRUE; +} + +int +main (int argc, char ** argv) +{ + GError * error = NULL; + + g_type_init(); + + DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); + g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL)))); + + DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); + guint nameret = 0; + + if (!org_freedesktop_DBus_request_name(bus_proxy, "org.dbusmenu.test", 0, &nameret, &error)) { + g_error("Unable to call to request name"); + return 1; + } + + if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { + g_error("Unable to get name"); + return 1; + } + + server = dbusmenu_server_new("/org/test"); + + timer_func(NULL); + g_timeout_add(2500, timer_func, NULL); + + mainloop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(mainloop); + + g_debug("Quiting"); + + return 0; +} diff --git a/tests/test-glib-submenu.h b/tests/test-glib-submenu.h new file mode 100644 index 0000000..b64c4ea --- /dev/null +++ b/tests/test-glib-submenu.h @@ -0,0 +1,78 @@ +/* +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 . +*/ + +typedef struct _layout_t layout_t; +struct _layout_t { + gint id; + layout_t * submenu; +}; + +layout_t submenu_2[] = { + {id: 2, submenu: NULL}, + {id: 3, submenu: NULL}, + {id: -1, submenu: NULL} +}; +layout_t submenu_3_1[] = { + {id: 3, submenu: NULL}, + {id: 4, submenu: NULL}, + {id: 5, submenu: NULL}, + {id: -1, submenu: NULL} +}; +layout_t submenu_3_2[] = { + {id: 7, submenu: NULL}, + {id: 8, submenu: NULL}, + {id: 9, submenu: NULL}, + {id: -1, submenu: NULL} +}; +layout_t submenu_3[] = { + {id: 2, submenu: submenu_3_1}, + {id: 6, submenu: submenu_3_2}, + {id: -1, submenu: NULL} +}; +layout_t submenu_4_1[] = { + {id: 6, submenu: NULL}, + {id: -1, submenu: NULL} +}; +layout_t submenu_4_2[] = { + {id: 5, submenu: submenu_4_1}, + {id: -1, submenu: NULL} +}; +layout_t submenu_4_3[] = { + {id: 4, submenu: submenu_4_2}, + {id: -1, submenu: NULL} +}; +layout_t submenu_4_4[] = { + {id: 3, submenu: submenu_4_3}, + {id: -1, submenu: NULL} +}; +layout_t submenu_4_5[] = { + {id: 2, submenu: submenu_4_4}, + {id: -1, submenu: NULL} +}; + +layout_t layouts[] = { + {id: 5, submenu: NULL}, + {id: 1, submenu: submenu_2}, + {id: 1, submenu: submenu_3}, + {id: 1, submenu: submenu_4_5}, + {id: -1, submenu: NULL} +}; + -- cgit v1.2.3 From dfe6aaaac398b91de31698656c8faaf85f69bb5b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 8 Jun 2010 13:12:12 -0500 Subject: Building the submenu tests --- tests/Makefile.am | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index cfa1399..f1b50bc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,6 +7,7 @@ TESTS = \ test-glib-properties \ test-glib-proxy \ test-glib-simple-items \ + test-glib-submenu \ test-gtk-label \ test-gtk-reorder @@ -20,6 +21,8 @@ check_PROGRAMS = \ test-glib-proxy-client \ test-glib-proxy-server \ test-glib-proxy-proxy \ + test-glib-submenu-client \ + test-glib-submenu-server \ test-gtk-label-client \ test-gtk-label-server \ test-glib-simple-items \ @@ -75,6 +78,38 @@ test_glib_layout_client_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ $(DBUSMENUGLIB_LIBS) +###################### +# Test Glib Submenu +###################### + +test-glib-submenu: test-glib-submenu-client test-glib-submenu-server Makefile.am + @echo "#!/bin/bash" > $@ + @echo $(DBUS_RUNNER) --task ./test-glib-submenu-client --task-name Client --task ./test-glib-submenu-server --task-name Server --ignore-return >> $@ + @chmod +x $@ + +test_glib_submenu_server_SOURCES = \ + test-glib-submenu.h \ + test-glib-submenu-server.c + +test_glib_submenu_server_CFLAGS = \ + -I $(srcdir)/.. \ + $(DBUSMENUGLIB_CFLAGS) -Wall -Werror + +test_glib_submenu_server_LDADD = \ + ../libdbusmenu-glib/libdbusmenu-glib.la \ + $(DBUSMENUGLIB_LIBS) + +test_glib_submenu_client_SOURCES = \ + test-glib-submenu.h \ + test-glib-submenu-client.c + +test_glib_submenu_client_CFLAGS = \ + -I $(srcdir)/.. \ + $(DBUSMENUGLIB_CFLAGS) -Wall -Werror + +test_glib_submenu_client_LDADD = \ + ../libdbusmenu-glib/libdbusmenu-glib.la \ + $(DBUSMENUGLIB_LIBS) ###################### # Test Glib Object -- cgit v1.2.3 From 915d4d952f7c2deb8e3f851f4144e203ec686333 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 8 Jun 2010 14:18:36 -0500 Subject: Making the layouts useful for us. --- tests/test-glib-submenu.h | 52 +++++++++++++---------------------------------- 1 file changed, 14 insertions(+), 38 deletions(-) (limited to 'tests') diff --git a/tests/test-glib-submenu.h b/tests/test-glib-submenu.h index b64c4ea..f585d1b 100644 --- a/tests/test-glib-submenu.h +++ b/tests/test-glib-submenu.h @@ -25,54 +25,30 @@ struct _layout_t { layout_t * submenu; }; -layout_t submenu_2[] = { - {id: 2, submenu: NULL}, - {id: 3, submenu: NULL}, - {id: -1, submenu: NULL} -}; -layout_t submenu_3_1[] = { - {id: 3, submenu: NULL}, - {id: 4, submenu: NULL}, - {id: 5, submenu: NULL}, - {id: -1, submenu: NULL} -}; -layout_t submenu_3_2[] = { +layout_t submenu_l2[] = { + {id: 6, submenu: NULL}, {id: 7, submenu: NULL}, {id: 8, submenu: NULL}, - {id: 9, submenu: NULL}, - {id: -1, submenu: NULL} -}; -layout_t submenu_3[] = { - {id: 2, submenu: submenu_3_1}, - {id: 6, submenu: submenu_3_2}, {id: -1, submenu: NULL} }; -layout_t submenu_4_1[] = { - {id: 6, submenu: NULL}, - {id: -1, submenu: NULL} -}; -layout_t submenu_4_2[] = { - {id: 5, submenu: submenu_4_1}, - {id: -1, submenu: NULL} -}; -layout_t submenu_4_3[] = { - {id: 4, submenu: submenu_4_2}, - {id: -1, submenu: NULL} -}; -layout_t submenu_4_4[] = { - {id: 3, submenu: submenu_4_3}, + +layout_t submenu[] = { + {id: 2, submenu: submenu_l2}, + {id: 3, submenu: submenu_l2}, {id: -1, submenu: NULL} }; -layout_t submenu_4_5[] = { - {id: 2, submenu: submenu_4_4}, + +layout_t no_submenu[] = { + {id: 4, submenu: NULL}, + {id: 5, submenu: NULL}, {id: -1, submenu: NULL} }; layout_t layouts[] = { - {id: 5, submenu: NULL}, - {id: 1, submenu: submenu_2}, - {id: 1, submenu: submenu_3}, - {id: 1, submenu: submenu_4_5}, + {id: 1, submenu: no_submenu}, + {id: 1, submenu: submenu}, + {id: 1, submenu: no_submenu}, + {id: 1, submenu: submenu}, {id: -1, submenu: NULL} }; -- 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') 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') 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