diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.am | 69 | ||||
-rw-r--r-- | tests/test-glib-simple-items.c | 9 | ||||
-rw-r--r-- | tests/test-gtk-reorder-server.c | 119 |
3 files changed, 188 insertions, 9 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 8c47a93..f111054 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,12 +1,15 @@ SUBDIRS = dbusmenu-gtk -check: tests - DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf -tests: test-glib-layout test-glib-properties test-gtk-label test-glib-simple-items +TESTS = \ + test-glib-layout \ + test-glib-properties \ + test-gtk-label \ + test-glib-simple-items \ + test-gtk-reorder -libexec_PROGRAMS = \ +check_PROGRAMS = \ glib-server-nomenu \ test-glib-layout-client \ test-glib-layout-server \ @@ -14,7 +17,8 @@ libexec_PROGRAMS = \ test-glib-properties-server \ test-gtk-label-client \ test-gtk-label-server \ - test-glib-simple-items + test-glib-simple-items \ + test-gtk-reorder-server glib_server_nomenu_SOURCES = \ glib-server-nomenu.c @@ -27,10 +31,14 @@ glib_server_nomenu_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ $(DBUSMENUGLIB_LIBS) - +###################### +# Test Glib Layout +###################### test-glib-layout: test-glib-layout-client test-glib-layout-server - $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return + @echo "#!/bin/sh" > test-glib-layout + @echo $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> test-glib-layout + @chmod +x test-glib-layout test_glib_layout_server_SOURCES = \ test-glib-layout.h \ @@ -57,9 +65,14 @@ test_glib_layout_client_LDADD = \ $(DBUSMENUGLIB_LIBS) +###################### +# Test Glib Properties +###################### test-glib-properties: test-glib-properties-client test-glib-properties-server - $(DBUS_RUNNER) --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return + @echo "#!/bin/sh" > test-glib-properties + @echo $(DBUS_RUNNER) --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return >> test-glib-properties + @chmod +x test-glib-properties test_glib_properties_server_SOURCES = \ test-glib-properties.h \ @@ -85,6 +98,9 @@ test_glib_properties_client_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ $(DBUSMENUGLIB_LIBS) +######################### +# Test Glib Simple Items +######################### test_glib_simple_items_SOURCES = \ test-glib-simple-items.c @@ -97,9 +113,14 @@ test_glib_simple_items_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ $(DBUSMENUGLIB_LIBS) +######################### +# Test GTK Label +######################### test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json - $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return + @echo "#!/bin/sh" > test-gtk-label + @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> test-gtk-label + @chmod +x test-gtk-label test_gtk_label_server_SOURCES = \ test-gtk-label-server.c @@ -131,7 +152,34 @@ test_gtk_label_client_LDADD = \ $(DBUSMENUGTK_LIBS) \ $(DBUSMENUTESTS_LIBS) +######################### +# Test GTK Reorder +######################### + +test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server + @echo "#!/bin/sh" > test-gtk-reorder + @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-reorder-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> test-gtk-reorder + @chmod +x test-gtk-reorder + +test_gtk_reorder_server_SOURCES = \ + test-gtk-reorder-server.c + +test_gtk_reorder_server_CFLAGS = \ + -I $(srcdir)/.. \ + $(DBUSMENUGTK_CFLAGS) \ + $(DBUSMENUTESTS_CFLAGS) \ + $(DBUSMENUGLIB_CFLAGS) -Wall -Werror + +test_gtk_reorder_server_LDADD = \ + ../libdbusmenu-glib/libdbusmenu-glib.la \ + ../libdbusmenu-gtk/libdbusmenu-gtk.la \ + $(DBUSMENUGTK_LIBS) \ + $(DBUSMENUTESTS_LIBS) + +######################### +# Other +######################### examplesdir = $(docdir)/examples/ @@ -141,3 +189,6 @@ examples_DATA = \ EXTRA_DIST = \ $(examples_DATA) \ test-gtk-label.json + +DISTCLEANFILES = \ + $(TESTS) diff --git a/tests/test-glib-simple-items.c b/tests/test-glib-simple-items.c index 56536e9..5b9f538 100644 --- a/tests/test-glib-simple-items.c +++ b/tests/test-glib-simple-items.c @@ -25,6 +25,13 @@ dummy_users (DbusmenuMenuitem * root) { return; } +static gboolean +quititall (gpointer data) +{ + g_main_quit(mainloop); + return FALSE; +} + int main (int argc, char ** argv) { @@ -37,6 +44,8 @@ main (int argc, char ** argv) dummy_users(root_menuitem); + g_timeout_add_seconds(1, quititall, NULL); + mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); diff --git a/tests/test-gtk-reorder-server.c b/tests/test-gtk-reorder-server.c new file mode 100644 index 0000000..2fd9bf7 --- /dev/null +++ b/tests/test-gtk-reorder-server.c @@ -0,0 +1,119 @@ +/* +A test for libdbusmenu to ensure its quality. + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould <ted@canonical.com> + +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 <http://www.gnu.org/licenses/>. +*/ + +#include <glib.h> + +#include <dbus/dbus.h> +#include <dbus/dbus-glib.h> +#include <dbus/dbus-glib-lowlevel.h> +#include <dbus/dbus-glib-bindings.h> + +#include <libdbusmenu-glib/menuitem.h> +#include <libdbusmenu-glib/server.h> + +#define NUMBER_TESTS 5 +#define NUMBER_ENTRIES 5 + +guint ordering [NUMBER_TESTS][NUMBER_ENTRIES] = { + {0, 1, 2, 3, 4}, + {1, 2, 3, 4, 0}, + {3, 1, 4, 2, 0}, + {4, 3, 2, 1, 0}, + {0, 1, 2, 3, 4} +}; + +gchar * names [NUMBER_ENTRIES] = { + "One", "Two", "Three", "Four", "Five" +}; + +DbusmenuMenuitem * entries[NUMBER_ENTRIES] = {0}; +DbusmenuMenuitem * root = NULL; + +gint test = 0; + +static DbusmenuServer * server = NULL; +static GMainLoop * mainloop = NULL; + +static gboolean +timer_func (gpointer data) +{ + if (test == NUMBER_TESTS) { + g_main_quit(mainloop); + return FALSE; + } + + g_debug("Testing pattern %d", test); + + int i; + for (i = 0; i < NUMBER_ENTRIES; i++) { + g_debug("Putting entry '%d' at position '%d'", i, ordering[test][i]); + dbusmenu_menuitem_child_reorder(root, entries[i], ordering[test][i]); + dbusmenu_menuitem_property_set(entries[i], "label", names[i]); + } + + test++; + 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, "glib.label.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"); + root = dbusmenu_menuitem_new(); + dbusmenu_server_set_root(server, root); + + int i; + for (i = 0; i < NUMBER_ENTRIES; i++) { + entries[i] = dbusmenu_menuitem_new(); + dbusmenu_menuitem_child_append(root, entries[i]); + } + + timer_func(NULL); + g_timeout_add_seconds(5, timer_func, NULL); + + mainloop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(mainloop); + + g_debug("Quiting"); + + return 0; +} + |