aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore2
-rw-r--r--tests/Makefile.am30
-rw-r--r--tests/test-gtk-reorder-server.c84
3 files changed, 114 insertions, 2 deletions
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 <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>
+
+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;
+}
+