diff options
author | JCWasmx86 <JCWasmx86@t-online.de> | 2022-06-05 15:51:33 +0200 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2023-04-29 21:00:17 +0200 |
commit | 60e2e1b2cbb349edb1d15b601a50dbba1a277110 (patch) | |
tree | 5188d88c859a67008d50506155db38c2651588ca | |
parent | 95eafeaaad98096564a896fee29f43a1f6ae3661 (diff) | |
download | vala-60e2e1b2cbb349edb1d15b601a50dbba1a277110.tar.gz |
Updated tests
-rw-r--r-- | dbusgen/tests/test-codegen.xml | 14 | ||||
-rw-r--r-- | dbusgen/tests/test-codegen.xml.vala-expected | 10 |
2 files changed, 20 insertions, 4 deletions
diff --git a/dbusgen/tests/test-codegen.xml b/dbusgen/tests/test-codegen.xml index 333bcff64..bd7b77be6 100644 --- a/dbusgen/tests/test-codegen.xml +++ b/dbusgen/tests/test-codegen.xml @@ -65,7 +65,7 @@ </method> <method name="TestGenericArray"> - <!-- <arg direction="in" type="a{ass}" name="dict_array_key"/> --> + <!-- TODO: Does this gvariant exist? <arg direction="in" type="a{ass}" name="dict_array_key"/> --> <arg direction="in" type="a{sas}" name="dict_array_value"/> </method> @@ -483,4 +483,16 @@ <property name="Type" type="i" access="readwrite"/> </interface> + <!-- Wellknown, duplicate interfaces should be ignored instead of an error --> + <interface name="org.freedesktop.DBus.Introspectable"> + <method name="Introspect"> + <arg name="xml_data" type="s" direction="out"/> + </method> + </interface> + + <interface name="org.freedesktop.DBus.Introspectable"> + <method name="Introspect"> + <arg name="xml_data" type="s" direction="out"/> + </method> + </interface> </node> diff --git a/dbusgen/tests/test-codegen.xml.vala-expected b/dbusgen/tests/test-codegen.xml.vala-expected index 0bfd2dbf9..8d151142f 100644 --- a/dbusgen/tests/test-codegen.xml.vala-expected +++ b/dbusgen/tests/test-codegen.xml.vala-expected @@ -8,8 +8,8 @@ public interface OrgProjectBar : GLib.Object { public abstract void test_non_primitive_types (GLib.HashTable<string,string> dict_s_to_s, [DBus (signature = "a{s(ii)}")] GLib.Variant dict_s_to_pairs, [DBus (signature = "(iss)")] GLib.Variant a_struct, string[] array_of_strings, out string[] ret_array_of_strings, GLib.ObjectPath[] array_of_objpaths, out GLib.ObjectPath[] ret_array_of_objpaths, string[] array_of_signatures, out string[] ret_array_of_signatures, string[] array_of_bytestrings, out string[] ret_array_of_bytestrings, out string result) throws GLib.DBusError, GLib.IOError; public abstract void test_generic_array ([DBus (signature = "a{sas}")] GLib.Variant dict_array_value) throws GLib.DBusError, GLib.IOError; public abstract void test_generic_primitive ([DBus (signature = "a{ts}")] GLib.Variant dict_primitive_key, [DBus (signature = "a{st}")] GLib.Variant dict_primitive_value) throws GLib.DBusError, GLib.IOError; - public abstract void test_duplicate_argname (string arg, out string arg0) throws GLib.DBusError, GLib.IOError; - public abstract void request_signal_emission (int32 which_one) throws GLib.DBusError, GLib.IOError; + public abstract void test_duplicate_argname (string arg, out string arg0) throws GLib.DBusError, GLib.IOError; + public abstract void request_signal_emission (int32 which_one) throws GLib.DBusError, GLib.IOError; public abstract void request_multi_property_mods () throws GLib.DBusError, GLib.IOError; public abstract void unimplemented_method () throws GLib.DBusError, GLib.IOError; public abstract void property_cancellation () throws GLib.DBusError, GLib.IOError; @@ -78,7 +78,7 @@ public interface OrgProjectBar : GLib.Object { [DBus (name = "unset_struct", signature = "(idsogayasaoag)")] public abstract GLib.Variant unset_struct { owned get; set; } [DBus (name = "HelloWorld")] - public signal void hello_world0 (string greeting); + public signal void hello_world0 (string greeting); /*Signal documentation.*/ public signal void test_signal (int32 val_int32, string[] array_of_strings, string[] array_of_bytestrings, [DBus (signature = "a{s(ii)}")] GLib.Variant dict_s_to_pairs); public signal void another_signal (string word); @@ -212,3 +212,7 @@ public interface FDPassing : GLib.Object { public interface Naming : GLib.Object { public abstract int32 type { get; set; } } +[DBus (name = "org.freedesktop.DBus.Introspectable", timeout = 120000)] +public interface OrgFreedesktopDBusIntrospectable : GLib.Object { + public abstract void introspect (out string xml_data) throws GLib.DBusError, GLib.IOError; +} |