tests: Add more "DBus" tests to increase coverage

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0343c0fdfbddaadfc164a56c47fbc13fc877fd72..611b3ae9f8c2b96a661a905960a93afbf44668bc 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -696,8 +696,10 @@ TESTS = \
        dbus/async-connection.test \
        dbus/async-errors.test \
        dbus/connection.test \
+       dbus/dbus-name-missing.test \
        dbus/dynamic-method.test \
        dbus/enum-string-marshalling.vala \
+       dbus/generics.test \
        dbus/signals.test \
        dbus/filedescriptor.test \
        dbus/filedescriptor-async.test \

diff --git a/tests/dbus/dbus-name-missing.test b/tests/dbus/dbus-name-missing.test
new file mode 100644 (file)
index 0000000..5da397f
--- /dev/null
+++ b/tests/dbus/dbus-name-missing.test
@@ -0,0 +1,9 @@
+Invalid Code
+
+class Test : Object {
+}
+
+void main () {
+       var conn = Bus.get_sync (BusType.SESSION);
+       conn.register_object<Test> ("/org/example/test", new Test ());
+}

diff --git a/tests/dbus/generics.test b/tests/dbus/generics.test
new file mode 100644 (file)
index 0000000..732d6a8
--- /dev/null
+++ b/tests/dbus/generics.test
@@ -0,0 +1,61 @@
+Packages: gio-2.0
+D-Bus
+
+Program: client
+
+[DBus (name = "org.example.Test")]
+interface Test : Object {
+       public abstract int get_test () throws DBusError, IOError;
+}
+
+T call<T> (DBusConnection conn, string name, string object_path) {
+       return conn.get_proxy_sync<T> (name, object_path);
+}
+
+void main () {
+       // client
+       var conn = Bus.get_sync (BusType.SESSION);
+
+       var test = call<Test> (conn, "org.example.Test", "/org/example/test");
+       int i = test.get_test ();
+       assert (i == 23);
+}
+
+Program: server
+
+[DBus (name = "org.example.Test")]
+class Test : Object {
+       public int get_test () throws DBusError, IOError {
+               return 23;
+       }
+}
+
+MainLoop main_loop;
+
+void client_exit (Pid pid, int status) {
+       // client finished, terminate server
+       assert (status == 0);
+       main_loop.quit ();
+}
+
+void reg<T> (DBusConnection conn, T t) throws Error {
+       conn.register_object<T> ("/org/example/test", t);
+}
+
+void main () {
+       var conn = Bus.get_sync (BusType.SESSION);
+       reg (conn, 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, { "dbus_generics_client" }, null, SpawnFlags.DO_NOT_REAP_CHILD, null, out client_pid);
+       ChildWatch.add (client_pid, client_exit);
+
+       main_loop = new MainLoop ();
+       main_loop.run ();
+}