tests: Add "Bus/DBusConnection.get_proxy*()" tests to increase coverage

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1d9aa496ae1a1a583bd2a396fb55b83524f2f86b..083b320fb6b16af2af1a7c15ff15e8061c02d3cb 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -575,7 +575,10 @@ TESTS = \
        dbus/structs.test \
        dbus/errors.test \
        dbus/async.test \
+       dbus/async-bus.test \
+       dbus/async-connection.test \
        dbus/async-errors.test \
+       dbus/connection.test \
        dbus/dynamic-method.test \
        dbus/enum-string-marshalling.vala \
        dbus/signals.test \

diff --git a/tests/dbus/async-bus.test b/tests/dbus/async-bus.test
new file mode 100644 (file)
index 0000000..88a643b
--- /dev/null
+++ b/tests/dbus/async-bus.test
@@ -0,0 +1,62 @@
+Packages: gio-2.0
+D-Bus
+
+Program: client
+
+[DBus (name = "org.example.Test")]
+interface Test : Object {
+       public abstract int get_test () throws DBusError, IOError;
+}
+
+MainLoop main_loop;
+
+void main () {
+       // client
+       Bus.get_proxy.begin<Test> (BusType.SESSION, "org.example.Test", "/org/example/test", 0, null, (o,r) => {
+               try {
+                       Test test = Bus.get_proxy.end<Test> (r);
+                       assert (test.get_test () == 4711);
+               } catch {
+               } finally {
+                       main_loop.quit ();
+               }
+       });
+
+       main_loop = new MainLoop (null, false);
+       main_loop.run ();
+}
+
+Program: server
+
+[DBus (name = "org.example.Test")]
+class Test : Object {
+       public int get_test () throws DBusError, IOError {
+               return 4711;
+       }
+}
+
+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, { "dbus_async_bus_client" }, null, SpawnFlags.DO_NOT_REAP_CHILD, null, out client_pid);
+       ChildWatch.add (client_pid, client_exit);
+
+       main_loop = new MainLoop ();
+       main_loop.run ();
+}

diff --git a/tests/dbus/async-connection.test b/tests/dbus/async-connection.test
new file mode 100644 (file)
index 0000000..eac98f5
--- /dev/null
+++ b/tests/dbus/async-connection.test
@@ -0,0 +1,63 @@
+Packages: gio-2.0
+D-Bus
+
+Program: client
+
+[DBus (name = "org.example.Test")]
+interface Test : Object {
+       public abstract int get_test () throws DBusError, IOError;
+}
+
+MainLoop main_loop;
+
+void main () {
+       // client
+       var conn = Bus.get_sync (BusType.SESSION);
+       conn.get_proxy.begin<Test> ("org.example.Test", "/org/example/test", 0, null, (o,r) => {
+               try {
+                       Test test = ((DBusConnection) o).get_proxy.end<Test> (r);
+                       assert (test.get_test () == 4711);
+               } catch {
+               } finally {
+                       main_loop.quit ();
+               }
+       });
+
+       main_loop = new MainLoop (null, false);
+       main_loop.run ();
+}
+
+Program: server
+
+[DBus (name = "org.example.Test")]
+class Test : Object {
+       public int get_test () throws DBusError, IOError {
+               return 4711;
+       }
+}
+
+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, { "dbus_async_connection_client" }, null, SpawnFlags.DO_NOT_REAP_CHILD, null, out client_pid);
+       ChildWatch.add (client_pid, client_exit);
+
+       main_loop = new MainLoop ();
+       main_loop.run ();
+}

diff --git a/tests/dbus/connection.test b/tests/dbus/connection.test
new file mode 100644 (file)
index 0000000..4ea75f2
--- /dev/null
+++ b/tests/dbus/connection.test
@@ -0,0 +1,52 @@
+Packages: gio-2.0
+D-Bus
+
+Program: client
+
+[DBus (name = "org.example.Test")]
+interface Test : Object {
+       public abstract int get_test () throws DBusError, IOError;
+}
+
+void main () {
+       // client
+       var conn = Bus.get_sync (BusType.SESSION);
+       Test test = conn.get_proxy_sync<Test> ("org.example.Test", "/org/example/test");
+
+       assert (test.get_test () == 4711);
+}
+
+Program: server
+
+[DBus (name = "org.example.Test")]
+class Test : Object {
+       public int get_test () throws DBusError, IOError {
+               return 4711;
+       }
+}
+
+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, { "dbus_connection_client" }, null, SpawnFlags.DO_NOT_REAP_CHILD, null, out client_pid);
+       ChildWatch.add (client_pid, client_exit);
+
+       main_loop = new MainLoop ();
+       main_loop.run ();
+}