From bc29c3e31adbed4dd2b93c1a461da9936b54456c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 9 Dec 2009 14:00:40 -0600
Subject: Adding in support for bustling the 'test-glib-layout' test results.

---
 tests/Makefile.am               | 5 +++--
 tests/test-glib-layout-client.c | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index fa85d7f..36b870d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -42,7 +42,7 @@ glib_server_nomenu_LDADD = \
 
 test-glib-layout: test-glib-layout-client test-glib-layout-server Makefile.am
 	@echo "#!/bin/bash" > $@
-	@echo $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> $@
+	@echo $(DBUS_RUNNER) -b test-glib-layout.bustle --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> $@
 	@chmod +x $@
 
 test_glib_layout_server_SOURCES = \
@@ -238,4 +238,5 @@ distclean-local:
 	-rm -rf $(builddir)/mago.results
 
 DISTCLEANFILES = \
-	$(TESTS)
+	$(TESTS) \
+	test-glib-layout.bustle
diff --git a/tests/test-glib-layout-client.c b/tests/test-glib-layout-client.c
index a7dd683..6a79321 100644
--- a/tests/test-glib-layout-client.c
+++ b/tests/test-glib-layout-client.c
@@ -111,7 +111,7 @@ main (int argc, char ** argv)
 
 	g_usleep(500000);
 
-	DbusmenuClient * client = dbusmenu_client_new(":1.0", "/org/test");
+	DbusmenuClient * client = dbusmenu_client_new(":1.1", "/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);
-- 
cgit v1.2.3


From a3492a08d1d914f0d62f8cc717288d4c10cda3ef Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 9 Dec 2009 15:32:43 -0600
Subject: Adding in a bunch of bustle data gathering and cleanup.

---
 tests/Makefile.am | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 36b870d..1d58700 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 
-DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
+DBUS_RUNNER=dbus-test-runner
 
 TESTS = \
 	test-glib-layout \
@@ -42,7 +42,7 @@ glib_server_nomenu_LDADD = \
 
 test-glib-layout: test-glib-layout-client test-glib-layout-server Makefile.am
 	@echo "#!/bin/bash" > $@
-	@echo $(DBUS_RUNNER) -b test-glib-layout.bustle --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> $@
+	@echo $(DBUS_RUNNER) -b $@.bustle --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> $@
 	@chmod +x $@
 
 test_glib_layout_server_SOURCES = \
@@ -76,7 +76,7 @@ test_glib_layout_client_LDADD = \
 
 test-glib-properties: test-glib-properties-client test-glib-properties-server Makefile.am
 	@echo "#!/bin/bash" > $@
-	@echo $(DBUS_RUNNER) --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return >> $@
+	@echo $(DBUS_RUNNER) -b $@.bustle --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return >> $@
 	@chmod +x $@
 
 test_glib_properties_server_SOURCES = \
@@ -125,7 +125,7 @@ test_glib_simple_items_LDADD = \
 test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json Makefile.am
 	@echo "#!/bin/bash" > $@
 	@echo $(XVFB_RUN) >> $@
-	@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 >> $@
+	@echo $(DBUS_RUNNER) -b $@.bustle --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> $@
 	@chmod +x $@
 
 test_gtk_label_server_SOURCES = \
@@ -165,7 +165,7 @@ test_gtk_label_client_LDADD = \
 test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server Makefile.am
 	@echo "#!/bin/bash" > $@
 	@echo $(XVFB_RUN) >> $@
-	@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 >> $@
+	@echo $(DBUS_RUNNER) -b $@.bustle --task ./test-gtk-label-client --task-name Client --task ./test-gtk-reorder-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> $@
 	@chmod +x $@
 
 test_gtk_reorder_server_SOURCES = \
@@ -239,4 +239,8 @@ distclean-local:
 
 DISTCLEANFILES = \
 	$(TESTS) \
-	test-glib-layout.bustle
+	test-glib-layout.bustle \
+	test-glib-properties.bustle \
+	test-glib-simple-items.bustle \
+	test-gtk-label.bustle \
+	test-gtk-reorder.bustle
-- 
cgit v1.2.3


From 91636df6e71cb70c627e60d7a2399cbbc1da3c24 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 9 Dec 2009 15:36:55 -0600
Subject: Switching to a new object number as now the bustler is there.

---
 tests/test-glib-properties-client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/test-glib-properties-client.c b/tests/test-glib-properties-client.c
index 39815aa..9e257ea 100644
--- a/tests/test-glib-properties-client.c
+++ b/tests/test-glib-properties-client.c
@@ -155,7 +155,7 @@ main (int argc, char ** argv)
 	/* Make sure the server starts up and all that */
 	g_usleep(500000);
 
-	DbusmenuClient * client = dbusmenu_client_new(":1.0", "/org/test");
+	DbusmenuClient * client = dbusmenu_client_new(":1.1", "/org/test");
 	g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
 
 	death_timer = g_timeout_add_seconds(10, timer_func, client);
-- 
cgit v1.2.3


From 1630c946d0a760ebf4796db40d4e70ce454e2e74 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 16 Dec 2009 21:35:02 -0600
Subject: Adding some debug messages to the printout.

---
 tests/test-gtk-label-client.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tests')

diff --git a/tests/test-gtk-label-client.c b/tests/test-gtk-label-client.c
index 09325be..070c278 100644
--- a/tests/test-gtk-label-client.c
+++ b/tests/test-gtk-label-client.c
@@ -152,9 +152,11 @@ main (int argc, char ** argv)
 {
 	gtk_init(&argc, &argv);
 
+	g_debug("Client Initialized.  Waiting.");
 	/* Make sure the server starts up and all that */
 	g_usleep(500000);
 
+	g_debug("Building Window");
 	GtkWidget * window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	GtkWidget * menubar = gtk_menu_bar_new();
 	GtkWidget * menuitem = gtk_menu_item_new_with_label("Test");
@@ -168,6 +170,7 @@ main (int argc, char ** argv)
 
 	death_timer = g_timeout_add_seconds(60, timer_func, window);
 
+	g_debug("Entering Mainloop");
 	mainloop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(mainloop);
 
-- 
cgit v1.2.3


From e22718dfc5c747182529e75b7d28f0b450b6ba5b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 17 Dec 2009 15:40:49 -0600
Subject: We killed the image item, time to update the tests.

---
 tests/test-gtk-label.json | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'tests')

diff --git a/tests/test-gtk-label.json b/tests/test-gtk-label.json
index 14584c3..17e2738 100644
--- a/tests/test-gtk-label.json
+++ b/tests/test-gtk-label.json
@@ -205,43 +205,43 @@
 	 "label": "value1",
 	 "submenu": [
 	 	{"id": 80,
-		 "type": "imageitem",
+		 "type": "menuitem",
 		 "icon": "face-angel",
 		 "label": "angel"},
 	 	{"id": 81,
-		 "type": "imageitem",
+		 "type": "menuitem",
 		 "icon": "face-angry",
 		 "label": "angry"},
 	 	{"id": 82,
-		 "type": "imageitem",
+		 "type": "menuitem",
 		 "icon": "face-cool",
 		 "label": "cool"},
 	 	{"id": 83,
-		 "type":"imageitem",
+		 "type":"menuitem",
 		 "icon": "face-devilish",
 		 "label": "devilish"},
 	 	{"id": 84,
-		 "type": "imageitem",
+		 "type": "menuitem",
 		 "icon": "face-embarrassed",
 		 "label": "embarrassed"},
 	 	{"id": 85,
-		 "type": "imageitem",
+		 "type": "menuitem",
 		 "icon": "face-kiss",
 		 "label": "kiss"},
 	 	{"id": 86,
-		 "type": "imageitem",
+		 "type": "menuitem",
 		 "icon": "face-laugh",
 		 "label": "laugh"},
 	 	{"id": 87,
-		 "type": "imageitem",
+		 "type": "menuitem",
 		 "icon": "face-monkey",
 		 "label": "monkey"},
 	 	{"id": 88,
-		 "type": "imageitem",
+		 "type": "menuitem",
 		 "icon": "face-sad",
 		 "label": "sad"},
 	 	{"id": 89,
-		 "type": "imageitem",
+		 "type": "menuitem",
 		 "icon": "face-sick",
 		 "label": "sick"}
 	 ]
@@ -250,7 +250,7 @@
 	 "label": "value1",
 	 "submenu": [
 	 	{"id": 90,
-		 "type": "imageitem",
+		 "type": "menuitem",
 		 "icon-data":
 "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACPUlEQVR4nGJgoBAAAAAA///Ch1gW
 BzK0LQ5iaGNgYGDBpQgAAAD//8KpeY4/Q9+DCV7/H/S4/p8byDABlyEAAAAA///CqnluAMOEx5O8
@@ -266,7 +266,7 @@ Bi8YEIEIBwAAAAD//8JmAAcDA4MAlEYGPxgYGD5AaTgAAAAA//8DAD6xjTP5Y+A7AAAAAElFTkSu
 QmCC",
 		 "label": "up"},
 	 	{"id": 91,
-		 "type": "imageitem",
+		 "type": "menuitem",
 		 "icon-data":
 "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACl0lEQVR4nGJgoBAAAAAA//9ixCLG
 sSWS4bs0B1QWip/+YGDwWcLAycDA8ANZMQAAAP//YsFigIA0JwODdvIsBob/fxgY/vxk+P/7OwPD
@@ -283,7 +283,7 @@ AwODR18kw4UJ0QyX8WkGAAAA///ClpkYoAolGBgYFKBqHjAwMDxnYGD4ha4QAAAA///CZQDMEG4o
 +ys2zQwMDAwAAAAA//8DAAF5nhyE7tENAAAAAElFTkSuQmCC",
 		 "label": "down"},
 	 	{"id": 92,
-		 "type": "imageitem",
+		 "type": "menuitem",
 		 "icon": "up",
 		 "icon-data":
 "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACl0lEQVR4nGJgoBAAAAAA//9ixCLG
@@ -301,7 +301,7 @@ AwODR18kw4UJ0QyX8WkGAAAA///ClpkYoAolGBgYFKBqHjAwMDxnYGD4ha4QAAAA///CZQDMEG4o
 +ys2zQwMDAwAAAAA//8DAAF5nhyE7tENAAAAAElFTkSuQmCC",
 		 "label": "up"},
 	 	{"id": 93,
-		 "type": "imageitem",
+		 "type": "menuitem",
 		 "icon": "down",
 		 "icon-data":
 "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACPUlEQVR4nGJgoBAAAAAA///Ch1gW
-- 
cgit v1.2.3


From c300f8c5be570efbf14792dcee496db8d957154e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 17 Dec 2009 15:43:00 -0600
Subject: Adding in a layout that has all kinds of different checks in it.

---
 tests/test-gtk-label.json | 49 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

(limited to 'tests')

diff --git a/tests/test-gtk-label.json b/tests/test-gtk-label.json
index 17e2738..464dc2d 100644
--- a/tests/test-gtk-label.json
+++ b/tests/test-gtk-label.json
@@ -319,4 +319,53 @@ QmCC",
 		 "label": "down"}
 	 ]
 	},
+	{"id": 1, "type": "menuitem",
+	 "label": "value1",
+	 "submenu": [
+	 	{"id": 30,
+		 "label": "No check (empty)",
+		 "toggle-type": "none"
+		 },
+	 	{"id": 31,
+		 "label": "No check (checked)",
+		 "toggle-type": "none",
+		 "toggle-checked": "checked"
+		 },
+	 	{"id": 32,
+		 "label": "No check (????)",
+		 "toggle-type": "none",
+		 "toggle-checked": "indeterminate"
+		 },
+	 	{"id": 33,
+		 "label": "Check (empty)",
+		 "toggle-type": "checkbox",
+		 "toggle-checked": "unchecked"
+		 },
+	 	{"id": 34,
+		 "label": "Check (checked)",
+		 "toggle-type": "checkbox",
+		 "toggle-checked": "checked"
+		 },
+	 	{"id": 35,
+		 "label": "Check (?????)",
+		 "toggle-type": "checkbox",
+		 "toggle-checked": "indeterminate"
+		 },
+	 	{"id": 36,
+		 "label": "Radio (empty)",
+		 "toggle-type": "radio",
+		 "toggle-checked": "unchecked"
+		 },
+	 	{"id": 37,
+		 "label": "Radio (checked)",
+		 "toggle-type": "radio",
+		 "toggle-checked": "checked"
+		 },
+	 	{"id": 38,
+		 "label": "Radio (?????)",
+		 "toggle-type": "radio",
+		 "toggle-checked": "indeterminate"
+		 }
+	 ]
+	},
 ]
-- 
cgit v1.2.3


From d7f273f9fced68bea1d711503b9a0fd2defa72c6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Dec 2009 14:29:56 -0600
Subject: Starting a framework for object testing.

---
 tests/test-glib-objects.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 tests/test-glib-objects.c

(limited to 'tests')

diff --git a/tests/test-glib-objects.c b/tests/test-glib-objects.c
new file mode 100644
index 0000000..cc95b81
--- /dev/null
+++ b/tests/test-glib-objects.c
@@ -0,0 +1,60 @@
+/*
+Testing for the various objects just by themselves.
+
+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 <glib-object.h>
+
+#include <libdbusmenu-glib/menuitem.h>
+
+void
+test_object_menuitem (void)
+{
+
+
+}
+
+void
+test_object_menuitem_props (void)
+{
+
+
+}
+
+void
+test_glib_objects_suite (void)
+{
+	g_test_add_func ("/dbusmenu/glib/objects/menuitem",          test_object_menuitem);
+	g_test_add_func ("/dbusmenu/glib/objects/menuitem-props",    test_object_menuitem_props);
+	return;
+}
+
+gint
+main (gint argc, gchar * argv[])
+{
+	g_type_init();
+	g_test_init(&argc, &argv, NULL);
+
+	/* Test suites */
+	test_glib_objects_suite();
+
+
+	return g_test_run ();
+}
-- 
cgit v1.2.3


From 7f05a7e84a3bf4bf936bc9e81465e7feac1f7487 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Dec 2009 14:41:50 -0600
Subject: Adding the object tests into the build.

---
 .bzrignore        |  2 ++
 tests/Makefile.am | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)

(limited to 'tests')

diff --git a/.bzrignore b/.bzrignore
index d7b28a6..66f815e 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -54,3 +54,5 @@ libdbusmenu-[0-9].[0-9].[0-9].tar.gz.asc
 tests/test-mago
 tests/*.bustle
 libdbusmenu-gtk/libdbusmenu_gtk_la-genericmenuitem.lo
+tests/test-glib-objects
+tests/test-glib-objects-test
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1d58700..0c2ab57 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,6 +2,7 @@
 DBUS_RUNNER=dbus-test-runner
 
 TESTS = \
+	test-glib-objects-test \
 	test-glib-layout \
 	test-glib-properties \
 	test-glib-simple-items \
@@ -10,6 +11,7 @@ TESTS = \
 
 check_PROGRAMS = \
 	glib-server-nomenu \
+	test-glib-objects \
 	test-glib-layout-client \
 	test-glib-layout-server \
 	test-glib-properties-client \
@@ -70,6 +72,26 @@ test_glib_layout_client_LDADD = \
 	$(DBUSMENUGLIB_LIBS)
 
 
+######################
+# Test Glib Object
+######################
+
+test-glib-objects-test: test-glib-objects Makefile.am
+	@echo "#!/bin/bash" > $@
+	@echo $(DBUS_RUNNER) -b $@.bustle --task gtester --parameter ./test-glib-objects >> $@
+	@chmod +x $@
+
+test_glib_objects_SOURCES = \
+	test-glib-objects.c
+
+test_glib_objects_CFLAGS = \
+	-I $(srcdir)/.. \
+	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_glib_objects_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	$(DBUSMENUGLIB_LIBS)
+
 ######################
 # Test Glib Properties
 ######################
@@ -239,6 +261,7 @@ distclean-local:
 
 DISTCLEANFILES = \
 	$(TESTS) \
+	test-glib-objects-test.bustle \
 	test-glib-layout.bustle \
 	test-glib-properties.bustle \
 	test-glib-simple-items.bustle \
-- 
cgit v1.2.3


From b03128c902c0b9906a34e3cc9f4fc5985d7a06d3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Dec 2009 14:52:44 -0600
Subject: Adding a menuitem allocation test.

---
 tests/test-glib-objects.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'tests')

diff --git a/tests/test-glib-objects.c b/tests/test-glib-objects.c
index cc95b81..cc59751 100644
--- a/tests/test-glib-objects.c
+++ b/tests/test-glib-objects.c
@@ -27,8 +27,22 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 void
 test_object_menuitem (void)
 {
+	/* Build a menu item */
+	DbusmenuMenuitem * item = dbusmenu_menuitem_new();
 
+	/* Test to make sure it's a happy object */
+	g_assert(item != NULL);
+	g_assert(G_IS_OBJECT(item));
+	g_assert(DBUSMENU_IS_MENUITEM(item));
 
+	/* Set up a check to make sure it gets destroyed on unref */
+	g_object_add_weak_pointer(G_OBJECT(item), (gpointer *)&item);
+	g_object_unref(item);
+
+	/* Did it go away? */
+	g_assert(item == NULL);
+
+	return;
 }
 
 void
-- 
cgit v1.2.3


From 46532dd8beb62a6aa4a639ee646eb0bf1682b75c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Dec 2009 14:56:49 -0600
Subject: Adding in an XML report file.

---
 tests/Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0c2ab57..fa18b9d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -76,9 +76,11 @@ test_glib_layout_client_LDADD = \
 # Test Glib Object
 ######################
 
+OBJECT_XML_REPORT = test-glib-objects.xml
+
 test-glib-objects-test: test-glib-objects Makefile.am
 	@echo "#!/bin/bash" > $@
-	@echo $(DBUS_RUNNER) -b $@.bustle --task gtester --parameter ./test-glib-objects >> $@
+	@echo $(DBUS_RUNNER) -b $@.bustle --task gtester --parameter -k --parameter -o --parameter $(OBJECT_XML_REPORT) --parameter ./test-glib-objects >> $@
 	@chmod +x $@
 
 test_glib_objects_SOURCES = \
@@ -261,6 +263,7 @@ distclean-local:
 
 DISTCLEANFILES = \
 	$(TESTS) \
+	$(OBJECT_XML_FILE) \
 	test-glib-objects-test.bustle \
 	test-glib-layout.bustle \
 	test-glib-properties.bustle \
-- 
cgit v1.2.3


From 0d32243f7b12d6d1bc94658a61c4f06c4643051b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Dec 2009 15:07:39 -0600
Subject: Setting all the different properties.

---
 tests/test-glib-objects.c | 70 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 67 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/test-glib-objects.c b/tests/test-glib-objects.c
index cc59751..d45baa0 100644
--- a/tests/test-glib-objects.c
+++ b/tests/test-glib-objects.c
@@ -46,17 +46,81 @@ test_object_menuitem (void)
 }
 
 void
-test_object_menuitem_props (void)
+test_object_menuitem_props_string (void)
 {
+	/* Build a menu item */
+	DbusmenuMenuitem * item = dbusmenu_menuitem_new();
+	const GValue * out = NULL;
+
+	/* Test to make sure it's a happy object */
+	g_assert(item != NULL);
+
+	/* Setting a string */
+	dbusmenu_menuitem_property_set(item, "string", "value");
+	out = dbusmenu_menuitem_property_get_value(item, "string");
+	g_assert(out != NULL);
+	g_assert(G_VALUE_TYPE(out) == G_TYPE_STRING);
+	g_assert(!g_strcmp0(g_value_get_string(out), "value"));
+	g_assert(!g_strcmp0(dbusmenu_menuitem_property_get(item, "string"), "value"));
+
+	g_object_unref(item);
+
+	return;
+}
+
+void
+test_object_menuitem_props_int (void)
+{
+	/* Build a menu item */
+	DbusmenuMenuitem * item = dbusmenu_menuitem_new();
+	const GValue * out = NULL;
+
+	/* Test to make sure it's a happy object */
+	g_assert(item != NULL);
+
+	/* Setting a string */
+	dbusmenu_menuitem_property_set_int(item, "int", 12345);
+	out = dbusmenu_menuitem_property_get_value(item, "int");
+	g_assert(out != NULL);
+	g_assert(G_VALUE_TYPE(out) == G_TYPE_INT);
+	g_assert(g_value_get_int(out) == 12345);
+	g_assert(dbusmenu_menuitem_property_get_int(item, "int") == 12345);
+
+	g_object_unref(item);
+
+	return;
+}
+
+void
+test_object_menuitem_props_bool (void)
+{
+	/* Build a menu item */
+	DbusmenuMenuitem * item = dbusmenu_menuitem_new();
+	const GValue * out = NULL;
 
+	/* Test to make sure it's a happy object */
+	g_assert(item != NULL);
 
+	/* Setting a string */
+	dbusmenu_menuitem_property_set_bool(item, "boolean", TRUE);
+	out = dbusmenu_menuitem_property_get_value(item, "boolean");
+	g_assert(out != NULL);
+	g_assert(G_VALUE_TYPE(out) == G_TYPE_BOOLEAN);
+	g_assert(g_value_get_boolean(out));
+	g_assert(dbusmenu_menuitem_property_get_int(item, "boolean"));
+
+	g_object_unref(item);
+
+	return;
 }
 
 void
 test_glib_objects_suite (void)
 {
-	g_test_add_func ("/dbusmenu/glib/objects/menuitem",          test_object_menuitem);
-	g_test_add_func ("/dbusmenu/glib/objects/menuitem-props",    test_object_menuitem_props);
+	g_test_add_func ("/dbusmenu/glib/objects/menuitem/base",          test_object_menuitem);
+	g_test_add_func ("/dbusmenu/glib/objects/menuitem/props_string",  test_object_menuitem_props_string);
+	g_test_add_func ("/dbusmenu/glib/objects/menuitem/props_int",     test_object_menuitem_props_int);
+	g_test_add_func ("/dbusmenu/glib/objects/menuitem/props_bool",    test_object_menuitem_props_bool);
 	return;
 }
 
-- 
cgit v1.2.3


From c96e551eccc631c726e0987ebe8ed859c2305e42 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Dec 2009 15:26:19 -0600
Subject: Testing setting the same prop multiple times of different types.

---
 tests/test-glib-objects.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'tests')

diff --git a/tests/test-glib-objects.c b/tests/test-glib-objects.c
index d45baa0..7f79746 100644
--- a/tests/test-glib-objects.c
+++ b/tests/test-glib-objects.c
@@ -114,6 +114,36 @@ test_object_menuitem_props_bool (void)
 	return;
 }
 
+void
+test_object_menuitem_props_swap (void)
+{
+	/* Build a menu item */
+	DbusmenuMenuitem * item = dbusmenu_menuitem_new();
+
+	/* Test to make sure it's a happy object */
+	g_assert(item != NULL);
+
+	/* Setting a boolean */
+	dbusmenu_menuitem_property_set_bool(item, "swapper", TRUE);
+	g_assert(dbusmenu_menuitem_property_get_bool(item, "swapper"));
+
+	/* Setting a int */
+	dbusmenu_menuitem_property_set_int(item, "swapper", 5432);
+	g_assert(dbusmenu_menuitem_property_get_int(item, "swapper") == 5432);
+
+	/* Setting a string */
+	dbusmenu_menuitem_property_set(item, "swapper", "mystring");
+	g_assert(!g_strcmp0(dbusmenu_menuitem_property_get(item, "swapper"), "mystring"));
+
+	/* Setting a boolean */
+	dbusmenu_menuitem_property_set_bool(item, "swapper", FALSE);
+	g_assert(!dbusmenu_menuitem_property_get_bool(item, "swapper"));
+
+	g_object_unref(item);
+
+	return;
+}
+
 void
 test_glib_objects_suite (void)
 {
@@ -121,6 +151,7 @@ test_glib_objects_suite (void)
 	g_test_add_func ("/dbusmenu/glib/objects/menuitem/props_string",  test_object_menuitem_props_string);
 	g_test_add_func ("/dbusmenu/glib/objects/menuitem/props_int",     test_object_menuitem_props_int);
 	g_test_add_func ("/dbusmenu/glib/objects/menuitem/props_bool",    test_object_menuitem_props_bool);
+	g_test_add_func ("/dbusmenu/glib/objects/menuitem/props_swap",    test_object_menuitem_props_swap);
 	return;
 }
 
-- 
cgit v1.2.3


From d33832e3fd108c002216551123d419ec494bd668 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Dec 2009 15:28:08 -0600
Subject: Comments are good for the soul.

---
 tests/test-glib-objects.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'tests')

diff --git a/tests/test-glib-objects.c b/tests/test-glib-objects.c
index 7f79746..d63c26d 100644
--- a/tests/test-glib-objects.c
+++ b/tests/test-glib-objects.c
@@ -24,6 +24,8 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <libdbusmenu-glib/menuitem.h>
 
+/* Building the basic menu item, make sure we didn't break
+   any core GObject stuff */
 void
 test_object_menuitem (void)
 {
@@ -45,6 +47,7 @@ test_object_menuitem (void)
 	return;
 }
 
+/* Set a string prop, make sure it's stored as one */
 void
 test_object_menuitem_props_string (void)
 {
@@ -68,6 +71,7 @@ test_object_menuitem_props_string (void)
 	return;
 }
 
+/* Set an integer prop, make sure it's stored as one */
 void
 test_object_menuitem_props_int (void)
 {
@@ -91,6 +95,7 @@ test_object_menuitem_props_int (void)
 	return;
 }
 
+/* Set a boolean prop, make sure it's stored as one */
 void
 test_object_menuitem_props_bool (void)
 {
@@ -114,6 +119,8 @@ test_object_menuitem_props_bool (void)
 	return;
 }
 
+/* Set the same property several times with
+   different types. */
 void
 test_object_menuitem_props_swap (void)
 {
@@ -144,6 +151,7 @@ test_object_menuitem_props_swap (void)
 	return;
 }
 
+/* Build the test suite */
 void
 test_glib_objects_suite (void)
 {
-- 
cgit v1.2.3


From f5a12b2235fe0437d58ec2743382eef39f2b40fc Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Dec 2009 15:59:41 -0600
Subject: Adding test to signal property changes.

---
 tests/test-glib-objects.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

(limited to 'tests')

diff --git a/tests/test-glib-objects.c b/tests/test-glib-objects.c
index d63c26d..1807243 100644
--- a/tests/test-glib-objects.c
+++ b/tests/test-glib-objects.c
@@ -151,6 +151,60 @@ test_object_menuitem_props_swap (void)
 	return;
 }
 
+/* A helper to put a value into a pointer for eval. */
+void
+test_object_menuitem_props_signals_helper (DbusmenuMenuitem * mi, gchar * property, GValue * value, GValue ** out)
+{
+	if (!g_strcmp0(property, "swapper")) {
+		*out = value;
+	}
+	return;
+}
+
+/* Set the same property several times with
+   different types. */
+void
+test_object_menuitem_props_signals (void)
+{
+	/* Build a menu item */
+	DbusmenuMenuitem * item = dbusmenu_menuitem_new();
+	GValue * out;
+
+	/* Test to make sure it's a happy object */
+	g_assert(item != NULL);
+
+	/* Setting up our callback */
+	g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(test_object_menuitem_props_signals_helper), &out);
+
+	/* Setting a boolean */
+	dbusmenu_menuitem_property_set_bool(item, "swapper", TRUE);
+	g_assert(out != NULL);
+	g_assert(g_value_get_boolean(out));
+	out = NULL;
+
+	/* Setting a int */
+	dbusmenu_menuitem_property_set_int(item, "swapper", 5432);
+	g_assert(out != NULL);
+	g_assert(g_value_get_int(out) == 5432);
+	out = NULL;
+
+	/* Setting a string */
+	dbusmenu_menuitem_property_set(item, "swapper", "mystring");
+	g_assert(out != NULL);
+	g_assert(!g_strcmp0(g_value_get_string(out), "mystring"));
+	out = NULL;
+
+	/* Setting a boolean */
+	dbusmenu_menuitem_property_set_bool(item, "swapper", FALSE);
+	g_assert(out != NULL);
+	g_assert(g_value_get_boolean(out));
+	out = NULL;
+
+	g_object_unref(item);
+
+	return;
+}
+
 /* Build the test suite */
 void
 test_glib_objects_suite (void)
@@ -160,6 +214,7 @@ test_glib_objects_suite (void)
 	g_test_add_func ("/dbusmenu/glib/objects/menuitem/props_int",     test_object_menuitem_props_int);
 	g_test_add_func ("/dbusmenu/glib/objects/menuitem/props_bool",    test_object_menuitem_props_bool);
 	g_test_add_func ("/dbusmenu/glib/objects/menuitem/props_swap",    test_object_menuitem_props_swap);
+	g_test_add_func ("/dbusmenu/glib/objects/menuitem/props_signals", test_object_menuitem_props_signals);
 	return;
 }
 
-- 
cgit v1.2.3


From 2d6a51051442499e65f4dade13ba91d13a28fca9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Dec 2009 16:01:49 -0600
Subject: Making functions static so that we can get warnings if we don't use
 them.

---
 tests/test-glib-objects.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'tests')

diff --git a/tests/test-glib-objects.c b/tests/test-glib-objects.c
index 1807243..9e46128 100644
--- a/tests/test-glib-objects.c
+++ b/tests/test-glib-objects.c
@@ -26,7 +26,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Building the basic menu item, make sure we didn't break
    any core GObject stuff */
-void
+static void
 test_object_menuitem (void)
 {
 	/* Build a menu item */
@@ -48,7 +48,7 @@ test_object_menuitem (void)
 }
 
 /* Set a string prop, make sure it's stored as one */
-void
+static void
 test_object_menuitem_props_string (void)
 {
 	/* Build a menu item */
@@ -72,7 +72,7 @@ test_object_menuitem_props_string (void)
 }
 
 /* Set an integer prop, make sure it's stored as one */
-void
+static void
 test_object_menuitem_props_int (void)
 {
 	/* Build a menu item */
@@ -96,7 +96,7 @@ test_object_menuitem_props_int (void)
 }
 
 /* Set a boolean prop, make sure it's stored as one */
-void
+static void
 test_object_menuitem_props_bool (void)
 {
 	/* Build a menu item */
@@ -121,7 +121,7 @@ test_object_menuitem_props_bool (void)
 
 /* Set the same property several times with
    different types. */
-void
+static void
 test_object_menuitem_props_swap (void)
 {
 	/* Build a menu item */
@@ -152,7 +152,7 @@ test_object_menuitem_props_swap (void)
 }
 
 /* A helper to put a value into a pointer for eval. */
-void
+static void
 test_object_menuitem_props_signals_helper (DbusmenuMenuitem * mi, gchar * property, GValue * value, GValue ** out)
 {
 	if (!g_strcmp0(property, "swapper")) {
@@ -163,12 +163,12 @@ test_object_menuitem_props_signals_helper (DbusmenuMenuitem * mi, gchar * proper
 
 /* Set the same property several times with
    different types. */
-void
+static void
 test_object_menuitem_props_signals (void)
 {
 	/* Build a menu item */
 	DbusmenuMenuitem * item = dbusmenu_menuitem_new();
-	GValue * out;
+	GValue * out = NULL;
 
 	/* Test to make sure it's a happy object */
 	g_assert(item != NULL);
@@ -206,7 +206,7 @@ test_object_menuitem_props_signals (void)
 }
 
 /* Build the test suite */
-void
+static void
 test_glib_objects_suite (void)
 {
 	g_test_add_func ("/dbusmenu/glib/objects/menuitem/base",          test_object_menuitem);
-- 
cgit v1.2.3


From 14e7084968a1ce9fe8a1c1419351f435acd0eda5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Dec 2009 16:15:12 -0600
Subject: Fix an assertion that is the wrong direction

---
 tests/test-glib-objects.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/test-glib-objects.c b/tests/test-glib-objects.c
index 9e46128..afa669a 100644
--- a/tests/test-glib-objects.c
+++ b/tests/test-glib-objects.c
@@ -155,6 +155,7 @@ test_object_menuitem_props_swap (void)
 static void
 test_object_menuitem_props_signals_helper (DbusmenuMenuitem * mi, gchar * property, GValue * value, GValue ** out)
 {
+	/* g_debug("Signal handler got: %s", property); */
 	if (!g_strcmp0(property, "swapper")) {
 		*out = value;
 	}
@@ -197,7 +198,7 @@ test_object_menuitem_props_signals (void)
 	/* Setting a boolean */
 	dbusmenu_menuitem_property_set_bool(item, "swapper", FALSE);
 	g_assert(out != NULL);
-	g_assert(g_value_get_boolean(out));
+	g_assert(!g_value_get_boolean(out));
 	out = NULL;
 
 	g_object_unref(item);
-- 
cgit v1.2.3


From 2c02b8e394a55f099b03066774543396078932aa Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Dec 2009 16:54:48 -0600
Subject: Adding a test for the string to boolean convertions

---
 tests/test-glib-objects.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'tests')

diff --git a/tests/test-glib-objects.c b/tests/test-glib-objects.c
index afa669a..7b22b7a 100644
--- a/tests/test-glib-objects.c
+++ b/tests/test-glib-objects.c
@@ -206,6 +206,49 @@ test_object_menuitem_props_signals (void)
 	return;
 }
 
+/* Set a boolean prop, as a string too! */
+static void
+test_object_menuitem_props_boolstr (void)
+{
+	/* Build a menu item */
+	DbusmenuMenuitem * item = dbusmenu_menuitem_new();
+
+	/* Test to make sure it's a happy object */
+	g_assert(item != NULL);
+
+	/* Setting a bool */
+	dbusmenu_menuitem_property_set_bool(item, "boolean", TRUE);
+	g_assert(dbusmenu_menuitem_property_get_bool(item, "boolean"));
+
+	/* Setting "true" */
+	dbusmenu_menuitem_property_set(item, "boolean", "true");
+	g_assert(dbusmenu_menuitem_property_get_bool(item, "boolean"));
+
+	/* Setting "True" */
+	dbusmenu_menuitem_property_set(item, "boolean", "True");
+	g_assert(dbusmenu_menuitem_property_get_bool(item, "boolean"));
+
+	/* Setting "TRUE" */
+	dbusmenu_menuitem_property_set(item, "boolean", "TRUE");
+	g_assert(dbusmenu_menuitem_property_get_bool(item, "boolean"));
+
+	/* Setting "false" */
+	dbusmenu_menuitem_property_set(item, "boolean", "false");
+	g_assert(!dbusmenu_menuitem_property_get_bool(item, "boolean"));
+
+	/* Setting "False" */
+	dbusmenu_menuitem_property_set(item, "boolean", "False");
+	g_assert(!dbusmenu_menuitem_property_get_bool(item, "boolean"));
+
+	/* Setting "FALSE" */
+	dbusmenu_menuitem_property_set(item, "boolean", "FALSE");
+	g_assert(!dbusmenu_menuitem_property_get_bool(item, "boolean"));
+
+	g_object_unref(item);
+
+	return;
+}
+
 /* Build the test suite */
 static void
 test_glib_objects_suite (void)
@@ -216,6 +259,7 @@ test_glib_objects_suite (void)
 	g_test_add_func ("/dbusmenu/glib/objects/menuitem/props_bool",    test_object_menuitem_props_bool);
 	g_test_add_func ("/dbusmenu/glib/objects/menuitem/props_swap",    test_object_menuitem_props_swap);
 	g_test_add_func ("/dbusmenu/glib/objects/menuitem/props_signals", test_object_menuitem_props_signals);
+	g_test_add_func ("/dbusmenu/glib/objects/menuitem/props_boolstr", test_object_menuitem_props_boolstr);
 	return;
 }
 
-- 
cgit v1.2.3


From 0c85926daf6361821a4a6023e8756d1634fbfd85 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 22 Dec 2009 20:51:37 -0600
Subject: Removing the bustle captures as we're not using them and they seem to
 be breaking on Hudson.

---
 tests/Makefile.am                   | 19 +++++++------------
 tests/test-glib-layout-client.c     |  2 +-
 tests/test-glib-objects.c           |  3 ++-
 tests/test-glib-properties-client.c |  2 +-
 4 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index fa18b9d..aaa958a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,7 +44,7 @@ glib_server_nomenu_LDADD = \
 
 test-glib-layout: test-glib-layout-client test-glib-layout-server Makefile.am
 	@echo "#!/bin/bash" > $@
-	@echo $(DBUS_RUNNER) -b $@.bustle --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> $@
+	@echo $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> $@
 	@chmod +x $@
 
 test_glib_layout_server_SOURCES = \
@@ -80,7 +80,7 @@ OBJECT_XML_REPORT = test-glib-objects.xml
 
 test-glib-objects-test: test-glib-objects Makefile.am
 	@echo "#!/bin/bash" > $@
-	@echo $(DBUS_RUNNER) -b $@.bustle --task gtester --parameter -k --parameter -o --parameter $(OBJECT_XML_REPORT) --parameter ./test-glib-objects >> $@
+	@echo $(DBUS_RUNNER) --task gtester --parameter --verbose --parameter -k --parameter -o --parameter $(OBJECT_XML_REPORT) --parameter ./test-glib-objects >> $@
 	@chmod +x $@
 
 test_glib_objects_SOURCES = \
@@ -100,7 +100,7 @@ test_glib_objects_LDADD = \
 
 test-glib-properties: test-glib-properties-client test-glib-properties-server Makefile.am
 	@echo "#!/bin/bash" > $@
-	@echo $(DBUS_RUNNER) -b $@.bustle --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return >> $@
+	@echo $(DBUS_RUNNER) --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return >> $@
 	@chmod +x $@
 
 test_glib_properties_server_SOURCES = \
@@ -149,7 +149,7 @@ test_glib_simple_items_LDADD = \
 test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json Makefile.am
 	@echo "#!/bin/bash" > $@
 	@echo $(XVFB_RUN) >> $@
-	@echo $(DBUS_RUNNER) -b $@.bustle --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 $(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 >> $@
 	@chmod +x $@
 
 test_gtk_label_server_SOURCES = \
@@ -189,7 +189,7 @@ test_gtk_label_client_LDADD = \
 test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server Makefile.am
 	@echo "#!/bin/bash" > $@
 	@echo $(XVFB_RUN) >> $@
-	@echo $(DBUS_RUNNER) -b $@.bustle --task ./test-gtk-label-client --task-name Client --task ./test-gtk-reorder-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> $@
+	@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 >> $@
 	@chmod +x $@
 
 test_gtk_reorder_server_SOURCES = \
@@ -263,10 +263,5 @@ distclean-local:
 
 DISTCLEANFILES = \
 	$(TESTS) \
-	$(OBJECT_XML_FILE) \
-	test-glib-objects-test.bustle \
-	test-glib-layout.bustle \
-	test-glib-properties.bustle \
-	test-glib-simple-items.bustle \
-	test-gtk-label.bustle \
-	test-gtk-reorder.bustle
+	$(OBJECT_XML_FILE)
+
diff --git a/tests/test-glib-layout-client.c b/tests/test-glib-layout-client.c
index 6a79321..a7dd683 100644
--- a/tests/test-glib-layout-client.c
+++ b/tests/test-glib-layout-client.c
@@ -111,7 +111,7 @@ main (int argc, char ** argv)
 
 	g_usleep(500000);
 
-	DbusmenuClient * client = dbusmenu_client_new(":1.1", "/org/test");
+	DbusmenuClient * client = dbusmenu_client_new(":1.0", "/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);
diff --git a/tests/test-glib-objects.c b/tests/test-glib-objects.c
index 7b22b7a..f3fbcc8 100644
--- a/tests/test-glib-objects.c
+++ b/tests/test-glib-objects.c
@@ -155,9 +155,10 @@ test_object_menuitem_props_swap (void)
 static void
 test_object_menuitem_props_signals_helper (DbusmenuMenuitem * mi, gchar * property, GValue * value, GValue ** out)
 {
-	/* g_debug("Signal handler got: %s", property); */
 	if (!g_strcmp0(property, "swapper")) {
 		*out = value;
+	} else {
+		g_warning("Signal handler got: %s", property);
 	}
 	return;
 }
diff --git a/tests/test-glib-properties-client.c b/tests/test-glib-properties-client.c
index 9e257ea..39815aa 100644
--- a/tests/test-glib-properties-client.c
+++ b/tests/test-glib-properties-client.c
@@ -155,7 +155,7 @@ main (int argc, char ** argv)
 	/* Make sure the server starts up and all that */
 	g_usleep(500000);
 
-	DbusmenuClient * client = dbusmenu_client_new(":1.1", "/org/test");
+	DbusmenuClient * client = dbusmenu_client_new(":1.0", "/org/test");
 	g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
 
 	death_timer = g_timeout_add_seconds(10, timer_func, client);
-- 
cgit v1.2.3


From 082554bfbf246c4fb4609ecae63d3bf01c85dda9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 22 Dec 2009 20:57:36 -0600
Subject: Typo on variable name.  Oh, I hate dynamically linked languages.

---
 tests/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index aaa958a..5297dbd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -263,5 +263,5 @@ distclean-local:
 
 DISTCLEANFILES = \
 	$(TESTS) \
-	$(OBJECT_XML_FILE)
+	$(OBJECT_XML_REPORT)
 
-- 
cgit v1.2.3


From 5c4c4143a5ea25ec408304fdc7463709163ff9a7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 7 Jan 2010 08:55:35 -0600
Subject: Removing the half second timeout as it's no longer needed.

---
 tests/test-glib-layout-client.c |  4 +---
 tests/test-glib-layout-server.c | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/test-glib-layout-client.c b/tests/test-glib-layout-client.c
index a7dd683..bb2d13a 100644
--- a/tests/test-glib-layout-client.c
+++ b/tests/test-glib-layout-client.c
@@ -109,9 +109,7 @@ main (int argc, char ** argv)
 {
 	g_type_init();
 
-	g_usleep(500000);
-
-	DbusmenuClient * client = dbusmenu_client_new(":1.0", "/org/test");
+	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);
diff --git a/tests/test-glib-layout-server.c b/tests/test-glib-layout-server.c
index cc9b8e7..40dd048 100644
--- a/tests/test-glib-layout-server.c
+++ b/tests/test-glib-layout-server.c
@@ -24,6 +24,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
+#include <dbus/dbus-glib-bindings.h>
 
 #include <libdbusmenu-glib/server.h>
 #include <libdbusmenu-glib/menuitem.h>
@@ -74,10 +75,26 @@ timer_func (gpointer data)
 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);
-- 
cgit v1.2.3


From dd5905100adb747872156560c4437643195a263c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 7 Jan 2010 10:40:45 -0600
Subject: Switching the test to 'checkmark'

---
 tests/test-gtk-label.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/test-gtk-label.json b/tests/test-gtk-label.json
index 464dc2d..4bd666a 100644
--- a/tests/test-gtk-label.json
+++ b/tests/test-gtk-label.json
@@ -338,17 +338,17 @@ QmCC",
 		 },
 	 	{"id": 33,
 		 "label": "Check (empty)",
-		 "toggle-type": "checkbox",
+		 "toggle-type": "checkmark",
 		 "toggle-checked": "unchecked"
 		 },
 	 	{"id": 34,
 		 "label": "Check (checked)",
-		 "toggle-type": "checkbox",
+		 "toggle-type": "checkmark",
 		 "toggle-checked": "checked"
 		 },
 	 	{"id": 35,
 		 "label": "Check (?????)",
-		 "toggle-type": "checkbox",
+		 "toggle-type": "checkmark",
 		 "toggle-checked": "indeterminate"
 		 },
 	 	{"id": 36,
-- 
cgit v1.2.3