Fixing annotations and adding tests with python.

3 files changed, 111 insertions, 3 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 32c8437..61b3e69 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,7 @@ DBUS_RUNNER=dbus-test-runner
 
 CLEANFILES=
 DISTCLEANFILES=
+EXTRA_DIST = 
 
 TESTS = \
 	test-glib-objects-test \
@@ -16,9 +17,11 @@ TESTS = \
 	test-gtk-objects-test \
 	test-gtk-label \
 	test-gtk-shortcut \
+	test-gtk-shortcut-python \
 	test-gtk-reorder \
 	test-gtk-submenu \
-	test-gtk-parser-test
+	test-gtk-parser-test \
+	test-glib-simple-items.py
 
 check_PROGRAMS = \
 	glib-server-nomenu \
@@ -49,6 +52,9 @@ check_PROGRAMS = \
 
 XVFB_RUN=". $(srcdir)/run-xvfb.sh"
 
+# for the GI tests, prefer/use the typelibs from the local build tree
+TESTS_ENVIRONMENT = env GI_TYPELIB_PATH=$(top_builddir)/libdbusmenu-glib:$(top_builddir)/libdbusmenu-gtk:$(GI_TYPELIB_PATH)
+
 ######################
 # JSON Loader lib
 ######################
@@ -361,6 +367,8 @@ test_glib_simple_items_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
 	$(DBUSMENUGLIB_LIBS)
 
+EXTRA_DIST += test-glib-simple-items.py
+
 ######################
 # Test GTK Object
 ######################
@@ -503,6 +511,19 @@ test_gtk_shortcut_client_LDADD = \
 	$(DBUSMENUTESTS_LIBS)
 
 #########################
+# Test GTK Shortcut Python
+#########################
+
+test-gtk-shortcut-python: test-gtk-shortcut-server test-gtk-shortcut-client.py Makefile.am
+	@echo "#!/bin/bash" > $@
+	@echo $(XVFB_RUN) >> $@
+	@echo $(DBUS_RUNNER) --task $(srcdir)/test-gtk-shortcut-client.py --task-name Client --task ./test-gtk-shortcut-server --task-name Server --ignore-return >> $@
+	@chmod +x $@
+
+EXTRA_DIST += test-gtk-shortcut-client.py
+CLEANFILES += test-gtk-shortcut-client.pyc
+
+#########################
 # Test GTK Reorder
 #########################
 
@@ -596,7 +617,7 @@ jsondir = $(datadir)/${PACKAGE}/json/
 json_DATA = \
 	test-gtk-label.json
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	$(examples_DATA) \
 	run-xvfb.sh \
 	$(json_DATA) \
@@ -629,5 +650,5 @@ distclean-local:
 	-rm -rf $(builddir)/mago.results
 
 DISTCLEANFILES += \
-	$(TESTS) 
+	$(filter-out %.py, $(TESTS))
 
diff --git a/tests/test-glib-simple-items.py b/tests/test-glib-simple-items.py
new file mode 100755
index 0000000..d7ad7d7
--- /dev/null
+++ b/tests/test-glib-simple-items.py
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+# This is the Python GI version of test-glib-simple-items.c
+
+import gobject
+from gi.repository import Dbusmenu
+
+dummies = ['Bob', 'Jim', 'Alvin', 'Mary']
+
+def dummy_users(root):
+    count = 0
+    for user in dummies:
+        mi = Dbusmenu.Menuitem()
+        print 'Creating item: %d %s' % (mi.get_id(), user)
+        print '\tRoot ID:', root.get_id()
+        mi.property_set('label', user)
+        root.child_add_position(mi, count)
+        assert mi.property_get('label') == user
+        count += 1
+
+def quititall(mainloop):
+    mainloop.quit()
+    return False
+
+# main
+
+server = Dbusmenu.Server.new('/test/object')
+root_menuitem = Dbusmenu.Menuitem()
+server.set_root(root_menuitem)
+print 'Root ID:', root_menuitem.get_id()
+
+dummy_users(root_menuitem)
+
+mainloop = gobject.MainLoop()
+gobject.timeout_add_seconds(1, quititall, mainloop)
+mainloop.run()
diff --git a/tests/test-gtk-shortcut-client.py b/tests/test-gtk-shortcut-client.py
new file mode 100755
index 0000000..885d227
--- /dev/null
+++ b/tests/test-gtk-shortcut-client.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+
+# A test for libdbusmenu to ensure its quality. This is the Python GI version
+# of test-gtk-shortcut-client.c
+#
+# Copyright 2011 Canonical Ltd.
+# Authors:
+#   Martin Pitt <martin.pitt@ubuntu.com>
+
+import sys
+import gobject
+from gi.repository import Gtk, DbusmenuGtk
+Gtk.require_version('2.0')
+
+passed = True
+main_loop = gobject.MainLoop()
+
+def timer_func(data):
+    passed = True
+    main_loop.quit()
+    return False
+
+# main
+print 'Building Window'
+window = Gtk.Window(type=Gtk.WindowType.TOPLEVEL)
+menubar = Gtk.MenuBar()
+menuitem = Gtk.MenuItem(label='Test')
+
+dmenu = DbusmenuGtk.Menu(dbus_name='glib.label.test', dbus_object='/org/test')
+dclient = dmenu.get_client()
+agroup = Gtk.AccelGroup()
+dclient.set_accel_group(agroup)
+
+menuitem.set_submenu(dmenu)
+menuitem.show()
+menubar.append(menuitem)
+menubar.show()
+window.add(menubar)
+window.set_title('libdbusmenu-gtk test')
+window.add_accel_group(agroup)
+window.show_all()
+
+gobject.timeout_add_seconds(10, timer_func, window)
+
+print 'Entering Mainloop'
+main_loop.run()
+
+if passed:
+    print 'Quiting'
+else:
+    print "Quiting as we're a failure"
+    sys.exit(1)