From: Rico Tzschichholz <ricotz@t-online.de>
Date: Sat, 20 Oct 2012 16:21:45 +0000 (+0200)
Subject: tests: Add D-Bus test for dictionary passing
X-Git-Tag: 0.18.1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ed170812df3ea2c2eebd9da500aa2894291840b;p=thirdparty%2Fvala.git

tests: Add D-Bus test for dictionary passing
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 13457eb45..3d2bc4a9f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -167,6 +167,7 @@ TESTS = \
 	dbus/async-errors.test \
 	dbus/signals.test \
 	dbus/filedescriptor.test \
+	dbus/dicts.test \
 	dbus/bug596862.vala \
 	dbus/bug602003.test \
 	gir/bug651773.test \
diff --git a/tests/dbus/dicts.test b/tests/dbus/dicts.test
new file mode 100644
index 000000000..c67c515ff
--- /dev/null
+++ b/tests/dbus/dicts.test
@@ -0,0 +1,59 @@
+Packages: gio-2.0
+D-Bus
+
+Program: client
+
+[DBus (name = "org.example.Test")]
+interface Test : Object {
+	public abstract HashTable<string, Variant> test_dict () throws IOError;
+}
+
+void main () {
+	// client
+	Test test = Bus.get_proxy_sync (BusType.SESSION, "org.example.Test", "/org/example/test");
+
+	HashTable<string, Variant> dict = test.test_dict ();
+	assert (dict.size () == 1);
+	Variant v = dict.lookup ("hello");
+	assert (v != null);
+	string[] s = (string[]) v;
+	assert (s.length == 1 && s[0] == "hello");
+}
+
+Program: server
+
+[DBus (name = "org.example.Test")]
+class Test : Object {
+	public HashTable<string, Variant> test_dict () {
+		string[] s = { "hello" };
+		HashTable<string, Variant> dict = new HashTable<string, Variant> (str_hash, null);
+		dict.insert ("hello", s);
+		return dict;
+	}
+}
+
+MainLoop main_loop;
+
+void client_exit (Pid pid, int status) {
+	// client finished, terminate server
+	assert (status == 0);
+	main_loop.quit ();
+}
+
+void main () {
+	var conn = Bus.get_sync (BusType.SESSION);
+	conn.register_object ("/org/example/test", new Test ());
+
+	// try to register service in session bus
+	var request_result = conn.call_sync ("org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus", "RequestName",
+	                                      new Variant ("(su)", "org.example.Test", 0x4), null, 0, -1);
+	assert ((uint) request_result.get_child_value (0) == 1);
+
+	// server ready, spawn client
+	Pid client_pid;
+	Process.spawn_async (null, { "test", "/dbus/dicts/client" }, null, SpawnFlags.DO_NOT_REAP_CHILD, null, out client_pid);
+	ChildWatch.add (client_pid, client_exit);
+
+	main_loop = new MainLoop ();
+	main_loop.run ();
+}