From ef964f38b92cc6151549fd5e7aed33776cdb567d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 30 Sep 2009 15:02:59 -0500 Subject: Cleaning up the tests so that they run and check their values in a friendly way. --- tests/Makefile.am | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 8c47a93..e96098f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,12 +1,14 @@ 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 -libexec_PROGRAMS = \ +check_PROGRAMS = \ glib-server-nomenu \ test-glib-layout-client \ test-glib-layout-server \ @@ -27,10 +29,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 +63,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 +96,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 +111,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 @@ -132,6 +151,9 @@ test_gtk_label_client_LDADD = \ $(DBUSMENUTESTS_LIBS) +######################### +# Other +######################### examplesdir = $(docdir)/examples/ -- cgit v1.2.3 From ad7737b4cec428bc1f97b1f2223e7b83be67f1e6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 30 Sep 2009 15:52:42 -0500 Subject: Building a test for reordering. --- .bzrignore | 2 + tests/Makefile.am | 30 ++++++++++++++- tests/test-gtk-reorder-server.c | 84 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 tests/test-gtk-reorder-server.c (limited to 'tests/Makefile.am') diff --git a/.bzrignore b/.bzrignore index 6cfba5d..37d9ae8 100644 --- a/.bzrignore +++ b/.bzrignore @@ -46,3 +46,5 @@ tests/test-glib-layout tests/test-glib-properties tests/test-gtk-label tests/test-gtk-reorder-server.c +tests/test-gtk-reorder-server +tests/test-gtk-reorder diff --git a/tests/Makefile.am b/tests/Makefile.am index e96098f..ace4bf4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,7 +6,8 @@ TESTS = \ test-glib-layout \ test-glib-properties \ test-gtk-label \ - test-glib-simple-items + test-glib-simple-items \ + test-gtk-reorder check_PROGRAMS = \ glib-server-nomenu \ @@ -16,7 +17,8 @@ check_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 @@ -150,6 +152,30 @@ 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 diff --git a/tests/test-gtk-reorder-server.c b/tests/test-gtk-reorder-server.c new file mode 100644 index 0000000..2d159f4 --- /dev/null +++ b/tests/test-gtk-reorder-server.c @@ -0,0 +1,84 @@ +/* +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 + +static void +menuitem_click(DbusmenuMenuitem * mi, gpointer user_data) +{ + g_debug("Clicked on: %d", dbusmenu_menuitem_get_id(mi)); + return; +} + +static DbusmenuServer * server = NULL; +static GMainLoop * mainloop = NULL; + +static gboolean +timer_func (gpointer data) +{ + menuitem_click(NULL, NULL); + return FALSE; +} + +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"); + + 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; +} + -- cgit v1.2.3 From 7367daba72850eb6c64f05a416a65256f3bac1e2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 2 Oct 2009 16:50:56 -0500 Subject: Cleaning up the tests after building them --- tests/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index ace4bf4..f111054 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -189,3 +189,6 @@ examples_DATA = \ EXTRA_DIST = \ $(examples_DATA) \ test-gtk-label.json + +DISTCLEANFILES = \ + $(TESTS) -- cgit v1.2.3