From d2ee9c6261888a13b0f531ad119b008b130daee9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 28 Jun 2010 17:56:45 -0500
Subject: Adding a JSON loader

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

(limited to 'tests/test-json-server.c')

diff --git a/tests/test-json-server.c b/tests/test-json-server.c
new file mode 100644
index 0000000..b2b8341
--- /dev/null
+++ b/tests/test-json-server.c
@@ -0,0 +1,60 @@
+#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/server.h>
+#include <libdbusmenu-glib/menuitem.h>
+
+#include "json-loader.h"
+
+static GMainLoop * mainloop = NULL;
+
+static gboolean
+timer_func (gpointer data)
+{
+	g_main_loop_quit(mainloop);
+	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, "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;
+	}
+
+	DbusmenuServer * server = dbusmenu_server_new("/org/test");
+
+	DbusmenuMenuitem * root = dbusmenu_json_build_from_file(argv[1]);
+	g_return_val_if_fail(root!=NULL, 1);
+
+	dbusmenu_server_set_root(server, root);
+
+	g_timeout_add(3000, 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 89f7fb74fba3d5a42603af450f4642fe43ac0406 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 28 Jun 2010 21:51:17 -0500
Subject: Setting timeout longer

---
 tests/test-json-server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/test-json-server.c')

diff --git a/tests/test-json-server.c b/tests/test-json-server.c
index b2b8341..cf6b605 100644
--- a/tests/test-json-server.c
+++ b/tests/test-json-server.c
@@ -49,7 +49,7 @@ main (int argc, char ** argv)
 
 	dbusmenu_server_set_root(server, root);
 
-	g_timeout_add(3000, timer_func, NULL);
+	g_timeout_add(10000, timer_func, NULL);
 
 	mainloop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(mainloop);
-- 
cgit v1.2.3


From 511e68461114325f3685bc547517668b179b4914 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 28 Jun 2010 22:39:59 -0500
Subject: Forgot copyright headers

---
 tests/test-json-server.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'tests/test-json-server.c')

diff --git a/tests/test-json-server.c b/tests/test-json-server.c
index cf6b605..fe9507a 100644
--- a/tests/test-json-server.c
+++ b/tests/test-json-server.c
@@ -1,3 +1,24 @@
+/*
+Test to check the json-loader and dbusmenu-dumper
+
+Copyright 2010 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>
-- 
cgit v1.2.3